(hs-set-up-overlay): New user var.

[gnu-emacs] / lisp / userlock.el

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 21c531312d65d99ea2a7d88cdadbe991470052d8..e6e5ef0a1b510d00f354a3a9ec6c080917655532 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -38,7 +38,7 @@
 (defun ask-user-about-lock (file opponent)
   "Ask user what to do when he wants to edit FILE but it is locked by OPPONENT.
 This function has a choice of three things to do:
-  do (signal 'buffer-file-locked (list FILE OPPONENT))
+  do (signal 'file-locked (list FILE OPPONENT))
     to refrain from editing the file
   return t (grab the lock on the file)
   return nil (edit the file even though it is locked).
@@ -115,7 +115,7 @@ The buffer in question is current when this function is called."
        (message "%s changed on disk; really edit the buffer? (y, n, r or C-h) "
                 (file-name-nondirectory fn))
        (let ((tem (downcase (let ((cursor-in-echo-area t))
-                              (read-char)))))
+                              (read-char-exclusive)))))
          (setq answer
                (if (= tem help-char)
                    'help
@@ -160,4 +160,5 @@ to get the latest version of the file, then make the change again.")
       (set-buffer standard-output)
       (help-mode))))
 
+;;; arch-tag: a61c5b60-e1c8-44fd-894a-c617f4dfc639
 ;;; userlock.el ends here