mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-28 01:00:52 -07:00
(after-find-file): New arg from-revert-buffer.
(revert-buffer): Pass t for that.
This commit is contained in:
parent
0edb981589
commit
6bac44b29c
1 changed files with 3 additions and 2 deletions
|
|
@ -740,13 +740,14 @@ The buffer is not selected, just returned to the caller."
|
|||
(after-find-file error (not nowarn))))
|
||||
buf)))
|
||||
|
||||
(defun after-find-file (&optional error warn noauto)
|
||||
(defun after-find-file (&optional error warn noauto from-revert-buffer)
|
||||
"Called after finding a file and by the default revert function.
|
||||
Sets buffer mode, parses local variables.
|
||||
Optional args ERROR, WARN, and NOAUTO: ERROR non-nil means there was an
|
||||
error in reading the file. WARN non-nil means warn if there
|
||||
exists an auto-save file more recent than the visited file.
|
||||
NOAUTO means don't mess with auto-save mode.
|
||||
FROM-REVERT-BUFFER means this call was from `revert-buffer'.
|
||||
Finishes by calling the functions in `find-file-hooks'."
|
||||
(setq buffer-read-only (not (file-writable-p buffer-file-name)))
|
||||
(if noninteractive
|
||||
|
|
@ -1912,7 +1913,7 @@ beginning and `after-revert-hook' at the end."
|
|||
(insert-file-contents file-name (not auto-save-p)
|
||||
nil nil t)))
|
||||
(goto-char (min opoint (point-max)))
|
||||
(after-find-file nil nil t)
|
||||
(after-find-file nil nil t t)
|
||||
(run-hooks 'after-revert-hook)
|
||||
t)))))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue