* simple.el (delete-trailing-whitespace): Fix last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f83dbdd344a75f8c9828883b52d79b3ef3ae3b44..0927ff478c223f30849e6979226a7a80125c1078 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * simple.el (delete-trailing-whitespace): Fix last change.
+
        * progmodes/perl-mode.el (perl-syntax-propertize-function):
        Don't confuse "y => 3" as the beginning of a `y' operation.
 

diff --git a/lisp/simple.el b/lisp/simple.el
index 142270930ca957e3a4b1113611aa8ef5d6169e37..14ce5ed18ecb54792a360bf352d386ad780cebf5 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -589,9 +589,9 @@ If the region is active, only delete whitespace within the region."
         ;; Delete trailing empty lines.
         (goto-char end-marker)
         (when (and (not end)
-                   (<= (skip-chars-backward "\n") -2)
                    ;; Really the end of buffer.
-                   (save-restriction (widen) (eobp)))
+                   (save-restriction (widen) (eobp))
+                   (<= (skip-chars-backward "\n") -2))
           (delete-region (1+ (point)) end-marker))
         (set-marker end-marker nil))))
   ;; Return nil for the benefit of `write-file-functions'.