summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2021-07-16 16:26:21 +0300
committerEli Zaretskii <eliz@gnu.org>2021-07-16 16:26:21 +0300
commitd8d9504c5a9f1b6d22eae131334b981c65881f0e (patch)
tree9b4d50cb48dad314b5e8ae723c49ac17a97b4b18 /lisp/files.el
parent87862f7e31e38b82d0e5937e338b71dab1738430 (diff)
downloademacs-d8d9504c5a9f1b6d22eae131334b981c65881f0e.tar.gz
emacs-d8d9504c5a9f1b6d22eae131334b981c65881f0e.tar.bz2
emacs-d8d9504c5a9f1b6d22eae131334b981c65881f0e.zip
; Fix wording of recent changes in documentation
* lisp/files.el (query-about-changed-file): * doc/emacs/files.texi (Visiting): * etc/NEWS: Fix the wording of a recent change. (Bug#10755)
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 253a2891807..862982b71df 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2154,12 +2154,13 @@ think it does, because \"free\" is pretty hard to define in practice."
:type '(choice integer (const :tag "Never issue warning" nil)))
(defcustom query-about-changed-file t
- "If non-nil, query the user when opening a file that has changed.
-This happens if the file is already visited in a buffer, and the
-file has changed, and the user re-visits the file.
+ "If non-nil, query the user when re-visiting a file that has changed.
+This happens if the file is already visited in a buffer, the
+file was changed externally, and the user re-visits the file.
-If nil, the user isn't prompted, but instead given a warning
-after switching to the buffer."
+If nil, don't prompt the user, but instead provide instructions for
+reverting, after switching to the buffer with its contents before
+the external changes."
:group 'files
:group 'find-file
:version "28.1"