(basic-save-buffer): Undo previous change.

diff --git a/lisp/files.el b/lisp/files.el
index a83bf037b1bda98028c6d4926f2cecd11a9fd7b8..ff47462f9ca3260e20d2de03dca802059348f9ab 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2606,7 +2606,6 @@ After saving the buffer, this function runs `after-save-hook'."
        (set-buffer (buffer-base-buffer)))
     (if (buffer-modified-p)
        (let ((recent-save (recent-auto-save-p))
-             msg
              setmodes tempsetmodes)
          ;; On VMS, rename file and buffer to get rid of version number.
          (if (and (eq system-type 'vax-vms)
@@ -2653,18 +2652,14 @@ After saving the buffer, this function runs `after-save-hook'."
                   (save-excursion
                     (goto-char (point-max))
                     (insert ?\n))))
-           (setq msg (current-message))
            ;; Support VC version backups.
            (vc-before-save)
            (or (run-hook-with-args-until-success 'write-contents-hooks)
                (run-hook-with-args-until-success 'local-write-file-hooks)
                (run-hook-with-args-until-success 'write-file-hooks)
-               (progn
-                 (unless (equal msg (current-message))
-                   (sit-for 2))
-                 ;; If a hook returned t, file is already "written".
-                 ;; Otherwise, write it the usual way now.
-                 (setq setmodes (basic-save-buffer-1))))
+               ;; If a hook returned t, file is already "written".
+               ;; Otherwise, write it the usual way now.
+               (setq setmodes (basic-save-buffer-1)))
            ;; Now we have saved the current buffer.  Let's make sure
            ;; that buffer-file-coding-system is fixed to what
            ;; actually used for saving by binding it locally.