Mercurial > emacs

changeset 24925:5169ebe70135

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(revert-buffer): Don't preserve point here. (revert-buffer-insert-file-contents-function): Doc fix.
author Richard M. Stallman <rms@gnu.org>
date Mon, 05 Jul 1999 22:49:45 +0000
parents ef8649234d91
children 4cb7e7beea27
files lisp/files.el
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/files.el	Mon Jul 05 16:49:22 1999 +0000
+++ b/lisp/files.el	Mon Jul 05 22:49:45 1999 +0000
@@ -2657,7 +2657,9 @@
 (defvar revert-buffer-insert-file-contents-function nil
   "Function to use to insert contents when reverting this buffer.
 Gets two args, first the nominal file name to use,
-and second, t if reading the auto-save file.")
+and second, t if reading the auto-save file.
+
+The function you specify is responsible for updating (or preserving) point.")
 
 (defvar before-revert-hook nil
   "Normal hook for `revert-buffer' to run before reverting.
@@ -2714,8 +2716,7 @@
   (interactive (list (not current-prefix-arg)))
   (if revert-buffer-function
       (funcall revert-buffer-function ignore-auto noconfirm)
-    (let* ((opoint (point))
-	   (auto-save-p (and (not ignore-auto)
+    (let* ((auto-save-p (and (not ignore-auto)
 			     (recent-auto-save-p)
 			     buffer-auto-save-file-name
 			     (file-readable-p buffer-auto-save-file-name)
@@ -2771,9 +2772,9 @@
 			  ;; any code conversion.
 			  (if auto-save-p 'no-conversion
 			    coding-system-for-read)))
+		     ;; Note that this preserves point in an intelligent way.
 		     (insert-file-contents file-name (not auto-save-p)
 					   nil nil t))))
-	       (goto-char (min opoint (point-max)))
 	       ;; Recompute the truename in case changes in symlinks
 	       ;; have changed the truename.
 	       (setq buffer-file-truename