(delete-trailing-whitespace): Don't delete formfeeds.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c90a1f02d9e20c313755401e0599fa485959ebfb..f8dcaf67ee2d4c8833b801b726bc57baec659a3e 100644 (file)
--- 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 f81b05f13b16c6992d2750859a2f685bb122e5b5..092dfad5f1608a1e3b2939664f2d4ad5d3f8446e 100644 (file)
--- 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 ()