[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master abdc5887c1 3/3: Use command substitution in bookmark-edit-annotat
From: |
Stefan Kangas |
Subject: |
master abdc5887c1 3/3: Use command substitution in bookmark-edit-annotation |
Date: |
Fri, 17 Jun 2022 07:12:19 -0400 (EDT) |
branch: master
commit abdc5887c1fb81ec7ce22d0645e4dfa10f9eee29
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Use command substitution in bookmark-edit-annotation
* lisp/bookmark.el (bookmark-default-annotation-text): Use command
substitution.
(bookmark-edit-annotation): Enter mode before inserting annotation
to get the correct command substitution.
---
lisp/bookmark.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b0b54e52d8..4a8ffc0fa0 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1027,7 +1027,8 @@ annotations."
bookmark-name)
(format-message
"# All lines which start with a `#' will be deleted.\n")
- "# Type C-c C-c when done.\n#\n"
+ (substitute-command-keys
+ "# Type \\[bookmark-send-edited-annotation] when done.\n#\n")
"# Author: " (user-full-name) " <" (user-login-name) "@"
(system-name) ">\n"
"# Date: " (current-time-string) "\n"))
@@ -1094,8 +1095,8 @@ Lines beginning with `#' are ignored."
If optional argument FROM-BOOKMARK-LIST is non-nil, return to the
bookmark list when editing is done."
(pop-to-buffer (generate-new-buffer-name "*Bookmark Annotation Compose*"))
- (bookmark-insert-annotation bookmark-name-or-record)
(bookmark-edit-annotation-mode)
+ (bookmark-insert-annotation bookmark-name-or-record)
(setq bookmark--annotation-from-bookmark-list from-bookmark-list)
(setq bookmark-annotation-name bookmark-name-or-record))