aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2021-07-20 18:37:40 +0300
committerEli Zaretskii2021-07-20 18:37:40 +0300
commitb575e44cbffbbfb8e09e26b94701f5bec65c9dc0 (patch)
treef559f2c2bcd8ec3063a3511547cae43126011b54
parent6bea195db5ba93380148723f6b7290187e94437e (diff)
downloademacs-b575e44cbffbbfb8e09e26b94701f5bec65c9dc0.tar.gz
emacs-b575e44cbffbbfb8e09e26b94701f5bec65c9dc0.zip
Fix documentation of a recent changeset
* lisp/autorevert.el (auto-revert-mode): * lisp/files.el (revert-buffer): Doc fix. (Bug#49661)
-rw-r--r--lisp/autorevert.el7
-rw-r--r--lisp/files.el11
2 files changed, 9 insertions, 9 deletions
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f8fd92d02bd..9197eadf225 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -391,10 +391,9 @@ disk changes.
391When a buffer is reverted, a message is generated. This can be 391When a buffer is reverted, a message is generated. This can be
392suppressed by setting `auto-revert-verbose' to nil. 392suppressed by setting `auto-revert-verbose' to nil.
393 393
394Reverting may also break markers in the buffer. To avoid that 394Reverting can sometimes fail to preserve all the markers in the buffer.
395you may set `revert-buffer-insert-file-contents-function' to the 395To avoid that, set `revert-buffer-insert-file-contents-function' to
396slower function `revert-buffer-insert-file-contents-delicately'. 396the slower function `revert-buffer-insert-file-contents-delicately'.
397See its description for details.
398 397
399Use `global-auto-revert-mode' to automatically revert all buffers. 398Use `global-auto-revert-mode' to automatically revert all buffers.
400Use `auto-revert-tail-mode' if you know that the file will only grow 399Use `auto-revert-tail-mode' if you know that the file will only grow
diff --git a/lisp/files.el b/lisp/files.el
index 01b8bdf5ff0..0606ed64823 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6278,10 +6278,6 @@ This undoes all changes since the file was visited or saved.
6278With a prefix argument, offer to revert from latest auto-save file, if 6278With a prefix argument, offer to revert from latest auto-save file, if
6279that is more recent than the visited file. 6279that is more recent than the visited file.
6280 6280
6281Reverting a buffer will try to preserve markers in the buffer,
6282but for better results see `revert-buffer-with-fine-grain'. For
6283details see the Info node `(elisp)Reverting'.
6284
6285This command also implements an interface for special buffers 6281This command also implements an interface for special buffers
6286that contain text that doesn't come from a file, but reflects 6282that contain text that doesn't come from a file, but reflects
6287some other data instead (e.g. Dired buffers, `buffer-list' 6283some other data instead (e.g. Dired buffers, `buffer-list'
@@ -6307,7 +6303,12 @@ This function binds `revert-buffer-in-progress-p' non-nil while it operates.
6307This function calls the function that `revert-buffer-function' specifies 6303This function calls the function that `revert-buffer-function' specifies
6308to do the work, with arguments IGNORE-AUTO and NOCONFIRM. 6304to do the work, with arguments IGNORE-AUTO and NOCONFIRM.
6309The default function runs the hooks `before-revert-hook' and 6305The default function runs the hooks `before-revert-hook' and
6310`after-revert-hook'." 6306`after-revert-hook'
6307
6308Reverting a buffer will try to preserve markers in the buffer,
6309but it cannot always preserve all of them. For better results,
6310use `revert-buffer-with-fine-grain', which tries harder to
6311preserve markers and overlays, at the price of being slower."
6311 ;; I admit it's odd to reverse the sense of the prefix argument, but 6312 ;; I admit it's odd to reverse the sense of the prefix argument, but
6312 ;; there is a lot of code out there that assumes that the first 6313 ;; there is a lot of code out there that assumes that the first
6313 ;; argument should be t to avoid consulting the auto-save file, and 6314 ;; argument should be t to avoid consulting the auto-save file, and