From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 2 Apr 1995 00:11:19 +0000 (+0000)
Subject: (fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
X-Git-Tag: emacs-19.34~4680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24aac19dbb7230a7a395ace89f2f700ea743bce1;p=emacs.git

(fill-region-as-paragraph): Remove fill-prefix first, then remove indentation.
---

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 00267fdae79..f1bcadd7565 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -211,9 +211,6 @@ space does not end a sentence, so don't break a line there."
 	  (if (or (memq justify '(right center))
 		  (< (current-indentation) (current-left-margin)))
 	      (indent-to-left-margin))
-	  ;; and remove indentation from other lines.
-	  (beginning-of-line 2)
-	  (indent-region (point) (point-max) 0)
 	  ;; Delete the fill prefix from every line except the first.
 	  ;; The first line may not even have a fill prefix.
 	  (goto-char from)
@@ -235,7 +232,12 @@ space does not end a sentence, so don't break a line there."
 		   (goto-char from)
 		   (and (looking-at fpre) (goto-char (match-end 0)))
 		   (setq from (point)))))
-	  ;; "from" is now before the text to fill,
+	  ;; Remove indentation from lines other than the first.
+	  (beginning-of-line 2)
+	  (indent-region (point) (point-max) 0)
+	  (goto-char from)
+
+	  ;; FROM, and point, are now before the text to fill,
 	  ;; but after any fill prefix on the first line.
 
 	  ;; Make sure sentences ending at end of line get an extra space.