[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 67a0eee: Mention the 'r' key in ask-user-about-supersession-help
From: |
Stefan Kangas |
Subject: |
master 67a0eee: Mention the 'r' key in ask-user-about-supersession-help |
Date: |
Fri, 24 Sep 2021 21:38:59 -0400 (EDT) |
branch: master
commit 67a0eee727925264041b610b8cf0360654590d51
Author: Daniel MartÃn <mardani29@yahoo.es>
Commit: Stefan Kangas <stefan@marxist.se>
Mention the 'r' key in ask-user-about-supersession-help
* 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)
---
lisp/userlock.el | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/lisp/userlock.el b/lisp/userlock.el
index a38f6ac..87a8b7b 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 67a0eee: Mention the 'r' key in ask-user-about-supersession-help,
Stefan Kangas <=