Merge branch 'electric-indent-mode'

rejeep · Apr 8, 2013 · a419a38 · a419a38
2 parents 8f086ae + 496abe1
commit a419a38
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/drag-stuff.el b/drag-stuff.el
@@ -96,7 +96,8 @@
 (defun drag-stuff-down (arg)
   "Drag stuff ARG lines down."
   (interactive "p")
-  (let ((auto-fill-function nil))
+  (let ((auto-fill-function nil)
+        (electric-indent-mode nil))
     (if mark-active
         (drag-stuff-lines-down arg)
       (drag-stuff-line-down arg))))

diff --git a/features/conflicting-modes.feature b/features/conflicting-modes.feature
@@ -22,3 +22,22 @@ Feature: Drag Stuff
           ;; ...
           ))
       """
+
+  Scenario: Electric indent mode
+    Given I insert:
+      """
+      class Foo
+        end
+        def bar
+      end
+      """
+    And I turn on drag-stuff
+    And I turn on electric-indent-mode
+    And I drag line "2" down
+    Then I should see:
+      """
+      class Foo
+        def bar
+        end
+      end
+      """