(delete-trailing-whitespace): Don't delete newlines too.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 751867d50eb..a8cbc78b0bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-03  Miles Bader  <miles@gnu.org>
+
+        * simple.el (delete-trailing-whitespace): Don't delete newlines too.
+
 2000-12-02  Stefan Monnier  <monnier@cs.yale.edu>
 
         * textmodes/tex-mode.el (tex-start-shell): Obey shell-file-name.
diff --git a/lisp/simple.el b/lisp/simple.el
index f05abdcf276..2158d35891c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -232,9 +232,11 @@ This respects narrowing, created by \\[narrow-to-region] and friends."
   (interactive "*")
   (save-match-data
     (save-excursion
+      (let (eol bol)         
       (goto-char (point-min))
-      (while (re-search-forward "\\s-+$" nil t)
-        (delete-region (match-beginning 0) (match-end 0))))))
+      (while (re-search-forward "\\s-$" nil t)
+        (skip-syntax-backward "-" (save-excursion (forward-line 0) (point)))
+        (delete-region (point) (match-end 0)))))))
 
 (defun newline-and-indent ()
   "Insert a newline, then indent according to major mode.