summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el3
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c90a1f02d9e..f8dcaf67ee2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-29 Gerd Moellmann <gerd@gnu.org>
+
+ * simple.el (delete-trailing-whitespace): Don't delete formfeeds.
+
2001-01-29 Stefan Monnier <monnier@cs.yale.edu>
* pcvs.el (cvs-mark-fis-dead): New function.
diff --git a/lisp/simple.el b/lisp/simple.el
index f81b05f13b1..092dfad5f16 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -237,6 +237,9 @@ This respects narrowing, created by \\[narrow-to-region] and friends."
(goto-char (point-min))
(while (re-search-forward "\\s-$" nil t)
(skip-syntax-backward "-" (save-excursion (forward-line 0) (point)))
+ ;; Don't delete formfeeds, even if they are considered whitespace.
+ (if (looking-at ".*\f")
+ (goto-char (match-end 0)))
(delete-region (point) (match-end 0))))))
(defun newline-and-indent ()