diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2016-09-02 11:44:13 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2016-09-02 11:44:13 -0400 |
| commit | 5a4bffb6617a274ca19bc7f5c1b1ceb6345651ab (patch) | |
| tree | e46b22767dd63377aa2ae58c845a9e2e29cb000e /doc/lispref/buffers.texi | |
| parent | 7dc4c3ba3fd243efa51fe8c2092b4a030be8307d (diff) | |
| download | emacs-5a4bffb6617a274ca19bc7f5c1b1ceb6345651ab.tar.gz | |
Check actual contents before promting about changed file
* lisp/userlock.el (userlock--check-content-unchanged)
(userlock--ask-user-about-supersession-threat): New functions.
* src/filelock.c (lock_file): Use them to avoid spurious prompting.
* doc/lispref/buffers.texi (Modification Time): Update doc of
ask-user-about-supersession-threat.
Diffstat (limited to 'doc/lispref/buffers.texi')
| -rw-r--r-- | doc/lispref/buffers.texi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 740d7cfd8a1..e4ef4d5db6e 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -669,8 +669,9 @@ reason. This function is used to ask a user how to proceed after an attempt to modify an buffer visiting file @var{filename} when the file is newer than the buffer text. Emacs detects this because the modification -time of the file on disk is newer than the last save-time of the -buffer. This means some other program has probably altered the file. +time of the file on disk is newer than the last save-time and its contents +have changed. +This means some other program has probably altered the file. @kindex file-supersession Depending on the user's answer, the function may return normally, in |