Merge from trunk.

[gnu-emacs] / lisp / saveplace.el

diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index b7d43bd230a88869a4eb0c66ae09974775351dec..2d1586d895a53beff42910329942ca67765213e9 100644 (file)
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -285,7 +285,7 @@ may have changed\) back to `save-place-alist'."
   (let ((cell (assoc buffer-file-name save-place-alist)))
     (if cell
        (progn
-         (or after-find-file-from-revert-buffer
+         (or revert-buffer-in-progress-p
              (goto-char (cdr cell)))
           ;; and make sure it will be saved again for later
           (setq save-place t)))))
@@ -300,7 +300,8 @@ may have changed\) back to `save-place-alist'."
 
 (add-hook 'find-file-hook 'save-place-find-file-hook t)
 
-(add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook))
 
 (add-hook 'kill-buffer-hook 'save-place-to-alist)