diff options
| author | Michael Albinus | 2011-03-10 12:28:33 +0100 |
|---|---|---|
| committer | Michael Albinus | 2011-03-10 12:28:33 +0100 |
| commit | f346fd6b406b8c2db3f747a23b49ba1221c2aeaf (patch) | |
| tree | befa9d06eb25d7c538dc979a219c143172f5fefd /lisp | |
| parent | 5ceaac0c61ab70280a67588eeb8536fcddc3f9be (diff) | |
| download | emacs-f346fd6b406b8c2db3f747a23b49ba1221c2aeaf.tar.gz emacs-f346fd6b406b8c2db3f747a23b49ba1221c2aeaf.zip | |
* 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 da61e7025ad..760224f601c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-10 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * simple.el (delete-trailing-whitespace): Return nil for the | ||
| 4 | benefit of `write-file-functions'. | ||
| 5 | |||
| 1 | 2011-03-10 Glenn Morris <rgm@gnu.org> | 6 | 2011-03-10 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program. | 8 | * 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." | |||
| 637 | (if (looking-at ".*\f") | 637 | (if (looking-at ".*\f") |
| 638 | (goto-char (match-end 0)))) | 638 | (goto-char (match-end 0)))) |
| 639 | (delete-region (point) (match-end 0))) | 639 | (delete-region (point) (match-end 0))) |
| 640 | (set-marker end-marker nil))))) | 640 | (set-marker end-marker nil)))) |
| 641 | ;; Return nil for the benefit of `write-file-functions'. | ||
| 642 | nil) | ||
| 641 | 643 | ||
| 642 | (defun newline-and-indent () | 644 | (defun newline-and-indent () |
| 643 | "Insert a newline, then indent according to major mode. | 645 | "Insert a newline, then indent according to major mode. |