aboutsummaryrefslogtreecommitdiffstats
path: root/src/filelock.c
diff options
context:
space:
mode:
authorStefan Monnier2016-09-02 11:44:13 -0400
committerStefan Monnier2016-09-02 11:44:13 -0400
commit5a4bffb6617a274ca19bc7f5c1b1ceb6345651ab (patch)
treee46b22767dd63377aa2ae58c845a9e2e29cb000e /src/filelock.c
parent7dc4c3ba3fd243efa51fe8c2092b4a030be8307d (diff)
downloademacs-5a4bffb6617a274ca19bc7f5c1b1ceb6345651ab.tar.gz
emacs-5a4bffb6617a274ca19bc7f5c1b1ceb6345651ab.zip
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 'src/filelock.c')
-rw-r--r--src/filelock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/filelock.c b/src/filelock.c
index 2f92e0fdc83..bde34e2c6c2 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -684,7 +684,7 @@ lock_file (Lisp_Object fn)
684 if (!NILP (subject_buf) 684 if (!NILP (subject_buf)
685 && NILP (Fverify_visited_file_modtime (subject_buf)) 685 && NILP (Fverify_visited_file_modtime (subject_buf))
686 && !NILP (Ffile_exists_p (fn))) 686 && !NILP (Ffile_exists_p (fn)))
687 call1 (intern ("ask-user-about-supersession-threat"), fn); 687 call1 (intern ("userlock--ask-user-about-supersession-threat"), fn);
688 688
689 } 689 }
690 690