From: Alan Mackenzie <acm@muc.de>
Date: Sun, 4 Feb 2007 11:16:54 +0000 (+0000)
Subject: (c-indent-line): Don't erase ^L when a line containing it is re-indented.
X-Git-Tag: emacs-pretest-22.0.94~398
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=647a3247fc50da6932c6d006ae576b37f34accff;p=emacs.git

(c-indent-line): Don't erase ^L when a line containing it is re-indented.
---

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 96924899ea3..f8375d7fe36 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -78,8 +78,10 @@ indentation change \(in columns)."
 	       (save-excursion
 		 (beginning-of-line)
 		 (looking-at (if line-cont-backslash
-				 "\\(\\s *\\)\\\\$"
-			       "\\(\\s *\\)$")))
+				 ;; Don't use "\\s " - ^L doesn't count as WS
+				 ;; here
+				 "\\([ \t]*\\)\\\\$"
+			       "\\([ \t]*\\)$")))
 	       (<= (point) (match-end 1)))
       ;; Delete all whitespace after point if there's only whitespace
       ;; on the line, so that any code that does back-to-indentation