From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 10 Mar 2011 11:28:33 +0000 (+0100)
Subject: * simple.el (delete-trailing-whitespace): Return nil for the
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~611
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f346fd6b406b8c2db3f747a23b49ba1221c2aeaf;p=emacs.git

* simple.el (delete-trailing-whitespace): Return nil for the
benefit of `write-file-functions'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da61e7025ad..760224f601c 100644
--- 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 653501625b5..7391ff82585 100644
--- 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.