summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2022-09-16 16:37:58 +0200
committerStefan Kangas <stefankangas@gmail.com>2022-09-16 17:08:24 +0200
commit9b09def4be5b348a984c3e73507206044c22f32b (patch)
treea101c990845f29ca5c2b9c2df39a4984435b3580
parentcce9c260b523ec4f8bc431469f3e5775bf4f9fa4 (diff)
downloademacs-9b09def4be5b348a984c3e73507206044c22f32b.tar.gz
Use substitute-command-keys in some vc messages
* lisp/vc/vc-dispatcher.el (vc-start-logentry): * lisp/vc/vc.el (vc-steal-lock): Use substitute-command-keys.
-rw-r--r--lisp/vc/vc-dispatcher.el6
-rw-r--r--lisp/vc/vc.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 36a6f27891b..f64809da616 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -704,7 +704,11 @@ PATCH-STRING is a patch to check in."
(erase-buffer)
(when (stringp comment) (insert comment)))
(if (or (not comment) initial-contents)
- (message "%s Type C-c C-c when done" msg)
+ (message (substitute-command-keys
+ (if (eq major-mode 'log-edit-mode)
+ "%s Type \\[log-edit-done] when done"
+ "%s Type \\`C-c C-c' when done"))
+ msg)
(vc-finish-logentry (eq comment t)))))
;; vc-finish-logentry is typically called from a log-edit buffer (see
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 4688137d923..c67dad69fce 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1627,7 +1627,9 @@ Type \\[vc-next-action] to check in changes.")
(format "I stole the lock on %s, " file-description)
(current-time-string)
".\n")
- (message "Please explain why you stole the lock. Type C-c C-c when done.")))
+ (message
+ (substitute-command-keys
+ "Please explain why you stole the lock. Type \\`C-c C-c' when done"))))
(defun vc-checkin (files backend &optional comment initial-contents rev patch-string)
"Check in FILES. COMMENT is a comment string; if omitted, a