diff options
| author | Alan Mackenzie | 2007-02-04 11:16:54 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2007-02-04 11:16:54 +0000 |
| commit | 647a3247fc50da6932c6d006ae576b37f34accff (patch) | |
| tree | eec0d5bd7b83631985487ff9c909a6fcdf1cfe38 | |
| parent | 0ac6528f44958bb65622ccae016060df07504eb2 (diff) | |
| download | emacs-647a3247fc50da6932c6d006ae576b37f34accff.tar.gz emacs-647a3247fc50da6932c6d006ae576b37f34accff.zip | |
(c-indent-line): Don't erase ^L when a line containing it is re-indented.
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 6 |
1 files changed, 4 insertions, 2 deletions
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)." | |||
| 78 | (save-excursion | 78 | (save-excursion |
| 79 | (beginning-of-line) | 79 | (beginning-of-line) |
| 80 | (looking-at (if line-cont-backslash | 80 | (looking-at (if line-cont-backslash |
| 81 | "\\(\\s *\\)\\\\$" | 81 | ;; Don't use "\\s " - ^L doesn't count as WS |
| 82 | "\\(\\s *\\)$"))) | 82 | ;; here |
| 83 | "\\([ \t]*\\)\\\\$" | ||
| 84 | "\\([ \t]*\\)$"))) | ||
| 83 | (<= (point) (match-end 1))) | 85 | (<= (point) (match-end 1))) |
| 84 | ;; Delete all whitespace after point if there's only whitespace | 86 | ;; Delete all whitespace after point if there's only whitespace |
| 85 | ;; on the line, so that any code that does back-to-indentation | 87 | ;; on the line, so that any code that does back-to-indentation |