; 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)

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index b57618fd5083050b26291eb758e15506cdf9669a..54ffcd3cafc23187e75cae57f3967a33f34e60cc 100644 (file)
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -228,12 +228,13 @@ actually contains wildcard characters.  You can disable the wildcard
 feature by customizing @code{find-file-wildcards}.
 
 @vindex query-about-changed-file
-  If you're asking to visit a file that's already in a buffer, but the
-file has changed externally, Emacs will ask you whether you want to
-re-load the file or not.  If you set @code{query-about-changed-file}
-to @code{nil}, Emacs won't query you, but instead just display the
-buffer and issue a message telling you how to revert the buffer from
-the file.
+  If you're asking to visit a file that's already visited in a buffer,
+but the file has changed externally, Emacs normally asks you whether
+you want to re-read the file from disk.  But if you set
+@code{query-about-changed-file} to @code{nil}, Emacs won't query you,
+but will instead just display the buffer's contents before the
+changes, and show an echo-area message telling you how to revert the
+buffer from the file.
 
 @kindex C-x C-v
 @findex find-alternate-file

diff --git a/etc/NEWS b/etc/NEWS
index cfa6a4e55b61e3e65ba560833ed2065ca5612224..e18b3d04aa4cdc4c8231c2ee58055fc2142bb28a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -311,9 +311,10 @@ prompt, and how you can tweak the file size threshold.
 +++
 ** New user option 'query-about-changed-file'.
 If non-nil (the default), users are prompted as before when
-re-visiting a file that has changed externally.  If nil, the user is
-not prompted, but instead the buffer is opened, and the user is given
-an instruction on how to revert the uffer.
+re-visiting a file that has changed externally after it was visited
+the first time.  If nil, the user is not prompted, but instead the
+buffer is opened with its contents before the change, and the user is
+given instructions how to revert the buffer.
 
 +++
 ** Improved support for terminal emulators that encode the Meta flag.

diff --git a/lisp/files.el b/lisp/files.el
index 253a2891807f7d9ccb00c96a837bf011f560d715..862982b71df8fbca05828379c3df960af932a722 100644 (file)
--- 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"