mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Mention the 'r' key in ask-user-about-supersession-help

Browse Source 
* lisp/userlock.el (ask-user-about-supersession-help): Replace "n, and
then M-x revert-buffer" in the help message with "r", which does the
same thing.  (Bug#50780)
This commit is contained in:
Daniel Martín 2021-09-24 15:32:01 +02:00 committed by Stefan Kangas
parent 38037e04cb
commit 67a0eee727
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/userlock.el
View File

@ -201,13 +201,10 @@ really edit the buffer? (%s, %s, %s or %s) "
(defun ask-user-about-supersession-help ()
(with-output-to-temp-buffer "*Help*"
(let ((revert-buffer-binding
;; This takes place in the original buffer.
(substitute-command-keys "\\[revert-buffer]")))
(with-current-buffer standard-output
(insert
(format
"You want to modify a buffer whose disk file has changed
(with-current-buffer standard-output
(insert
(format
"You want to modify a buffer whose disk file has changed
since you last read it in or saved it with this buffer.
If you say %s to go ahead and modify this buffer,
@ -216,14 +213,13 @@ If you say %s to revert, the contents of the buffer are refreshed
from the file on disk.
If you say %s, the change you started to make will be aborted.
Usually, you should type %s and then %s,
to get the latest version of the file, then make the change again."
(userlock--fontify-key "y")
(userlock--fontify-key "r")
(userlock--fontify-key "n")
(userlock--fontify-key "n")
revert-buffer-binding))
(help-mode)))))
Usually, you should type %s to get the latest version of the
file, then make the change again."
(userlock--fontify-key "y")
(userlock--fontify-key "r")
(userlock--fontify-key "n")
(userlock--fontify-key "r")))
(help-mode))))
;;;###autoload
(defun userlock--handle-unlock-error (error)