[Emacs-diffs] Changes to emacs/lisp/files.el

[Richard M. Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.546 emacs/lisp/files.el:1.547
*** emacs/lisp/files.el:1.546   Sat Dec 29 21:39:12 2001
--- emacs/lisp/files.el Thu Jan  3 21:13:37 2002
***************
*** 2606,2612 ****
        (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)
--- 2606,2611 ----
***************
*** 2653,2670 ****
                   (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))))
            ;; 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.
--- 2652,2665 ----
                   (save-excursion
                     (goto-char (point-max))
                     (insert ?\n))))
            ;; 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)
!               ;; 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.