diff options
author | Michael Albinus <[email protected]> | 2011-03-10 12:28:33 +0100 |
---|---|---|
committer | Michael Albinus <[email protected]> | 2011-03-10 12:28:33 +0100 |
commit | f346fd6b406b8c2db3f747a23b49ba1221c2aeaf (patch) | |
tree | befa9d06eb25d7c538dc979a219c143172f5fefd /lisp | |
parent | 5ceaac0c61ab70280a67588eeb8536fcddc3f9be (diff) |
* simple.el (delete-trailing-whitespace): Return nil for the
benefit of `write-file-functions'.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/simple.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index da61e7025a..760224f601 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-10 Michael Albinus <[email protected]> + + * simple.el (delete-trailing-whitespace): Return nil for the + benefit of `write-file-functions'. + 2011-03-10 Glenn Morris <[email protected]> * 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 653501625b..7391ff8258 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. |