diff options
| author | Eli Zaretskii | 2021-07-20 18:37:40 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-07-20 18:37:40 +0300 |
| commit | b575e44cbffbbfb8e09e26b94701f5bec65c9dc0 (patch) | |
| tree | f559f2c2bcd8ec3063a3511547cae43126011b54 | |
| parent | 6bea195db5ba93380148723f6b7290187e94437e (diff) | |
| download | emacs-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.el | 7 | ||||
| -rw-r--r-- | lisp/files.el | 11 |
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. | |||
| 391 | When a buffer is reverted, a message is generated. This can be | 391 | When a buffer is reverted, a message is generated. This can be |
| 392 | suppressed by setting `auto-revert-verbose' to nil. | 392 | suppressed by setting `auto-revert-verbose' to nil. |
| 393 | 393 | ||
| 394 | Reverting may also break markers in the buffer. To avoid that | 394 | Reverting can sometimes fail to preserve all the markers in the buffer. |
| 395 | you may set `revert-buffer-insert-file-contents-function' to the | 395 | To avoid that, set `revert-buffer-insert-file-contents-function' to |
| 396 | slower function `revert-buffer-insert-file-contents-delicately'. | 396 | the slower function `revert-buffer-insert-file-contents-delicately'. |
| 397 | See its description for details. | ||
| 398 | 397 | ||
| 399 | Use `global-auto-revert-mode' to automatically revert all buffers. | 398 | Use `global-auto-revert-mode' to automatically revert all buffers. |
| 400 | Use `auto-revert-tail-mode' if you know that the file will only grow | 399 | Use `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. | |||
| 6278 | With a prefix argument, offer to revert from latest auto-save file, if | 6278 | With a prefix argument, offer to revert from latest auto-save file, if |
| 6279 | that is more recent than the visited file. | 6279 | that is more recent than the visited file. |
| 6280 | 6280 | ||
| 6281 | Reverting a buffer will try to preserve markers in the buffer, | ||
| 6282 | but for better results see `revert-buffer-with-fine-grain'. For | ||
| 6283 | details see the Info node `(elisp)Reverting'. | ||
| 6284 | |||
| 6285 | This command also implements an interface for special buffers | 6281 | This command also implements an interface for special buffers |
| 6286 | that contain text that doesn't come from a file, but reflects | 6282 | that contain text that doesn't come from a file, but reflects |
| 6287 | some other data instead (e.g. Dired buffers, `buffer-list' | 6283 | some 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. | |||
| 6307 | This function calls the function that `revert-buffer-function' specifies | 6303 | This function calls the function that `revert-buffer-function' specifies |
| 6308 | to do the work, with arguments IGNORE-AUTO and NOCONFIRM. | 6304 | to do the work, with arguments IGNORE-AUTO and NOCONFIRM. |
| 6309 | The default function runs the hooks `before-revert-hook' and | 6305 | The default function runs the hooks `before-revert-hook' and |
| 6310 | `after-revert-hook'." | 6306 | `after-revert-hook' |
| 6307 | |||
| 6308 | Reverting a buffer will try to preserve markers in the buffer, | ||
| 6309 | but it cannot always preserve all of them. For better results, | ||
| 6310 | use `revert-buffer-with-fine-grain', which tries harder to | ||
| 6311 | preserve 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 |