* lisp/indent.el (indent-according-to-mode): Flush to column 0 in text-mode

after an empty line.

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f1f38a950b..241e4ed242b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent.el (indent-according-to-mode): Flush to column 0 in text-mode
+        after an empty line.
+
 2014-01-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * net/shr.el (shr-render-region): Autoload.
diff --git a/lisp/indent.el b/lisp/indent.el
index 4cd669ccf37..2af5a58f6c5 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -76,9 +76,10 @@ that case, indent by aligning to the previous non-blank line."
       ;; indenting.  Replace with something ad-hoc.
       (let ((column (save-excursion
                       (beginning-of-line)
-                      (skip-chars-backward "\n \t")
-                      (beginning-of-line)
-                      (current-indentation))))
+                      (if (bobp) 0
+                        (beginning-of-line 0)
+                        (if (looking-at "[ \t]*$") 0
+                          (current-indentation))))))
         (if (<= (current-column) (current-indentation))
             (indent-line-to column)
           (save-excursion (indent-line-to column))))