(undigestify-rmail-message): Better error messages.

[bpt/emacs.git] / lisp / userlock.el

diff --git a/lisp/userlock.el b/lisp/userlock.el
index b79859d..ca4f216 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -76,7 +76,10 @@ already started modifying in EMACS.
 You can <s>teal the file; The other user becomes the
   intruder if (s)he ever unmodifies the file and then changes it again.
 You can <p>roceed; you edit at your own (and the other user's) risk.
-You can <q>uit; don't modify this file.")))
+You can <q>uit; don't modify this file.")
+    (save-excursion
+      (set-buffer standard-output)
+      (help-mode))))
 
 (put
  'file-supersession 'error-conditions '(file-supersession file-error error))
@@ -94,7 +97,8 @@ The buffer in question is current when this function is called."
   (save-window-excursion
     (let (answer)
       (while (null answer)
-       (message "File has changed on disk; really want to edit the buffer? (y, n or C-h) ")
+       (message "%s changed on disk; really edit the buffer? (y, n or C-h) "
+                (file-name-nondirectory fn))
        (let ((tem (downcase (let ((cursor-in-echo-area t))
                               (read-char)))))
          (setq answer
@@ -128,6 +132,9 @@ you risk ruining the work of whoever rewrote the file.
 If you say `n', the change you started to make will be aborted.
 
 Usually, you should type `n' and then `M-x revert-buffer',
-to get the latest version of the file, then make the change again.")))
+to get the latest version of the file, then make the change again.")
+    (save-excursion
+      (set-buffer standard-output)
+      (help-mode))))
 
 ;;; userlock.el ends here