* lisp/simple.el (delete-trailing-whitespace): Also delete

extra newlines at the end of the buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c52d626c02e86bf86b3667695bf016c1b1ddcdc..f17ba200815828653cb9d480f58a7ba0c0d631b8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-23  Peter J. Weisberg  <pj@irregularexpressions.net>
 
+       * simple.el (delete-trailing-whitespace): Also delete
+       extra newlines at the end of the buffer.
+
        * textmodes/picture.el: Make motion commands obey shift-select-mode.
        (picture-newline): Use forward-line so as to ignore fields.
 

diff --git a/lisp/simple.el b/lisp/simple.el
index 35193135396e5379d78b45fa339f53849239fd3d..c828584c17f4d4106f6a398450524229447dbef4 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -586,6 +586,12 @@ 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)))
+        (save-restriction
+          (goto-char end-marker)
+          (widen)
+          (if (and (eobp)
+                   (looking-back "\n\n+" nil t))
+              (replace-match "\n")))
         (set-marker end-marker nil))))
   ;; Return nil for the benefit of `write-file-functions'.
   nil)