* simple.el (delete-trailing-whitespace): Return nil for the

benefit of `write-file-functions'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da61e7025ad2f167ab6e11724e3f39b8150c18c0..760224f601c34e409b053f70417cdbc70ac48095 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-10  Michael Albinus  <michael.albinus@gmx.de>
+
+       * simple.el (delete-trailing-whitespace): Return nil for the
+       benefit of `write-file-functions'.
+
 2011-03-10  Glenn Morris  <rgm@gnu.org>
 
        * vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.

diff --git a/lisp/simple.el b/lisp/simple.el
index 653501625b5073744641d708a54944159b281659..7391ff82585c77a5a33a0f0d6b9524adbef17e6b 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -637,7 +637,9 @@ If the region is active, only delete whitespace within the region."
             (if (looking-at ".*\f")
                 (goto-char (match-end 0))))
           (delete-region (point) (match-end 0)))
-        (set-marker end-marker nil)))))
+        (set-marker end-marker nil))))
+  ;; Return nil for the benefit of `write-file-functions'.
+  nil)
 
 (defun newline-and-indent ()
   "Insert a newline, then indent according to major mode.