diff options
author | Stefan Kangas <stefan@marxist.se> | 2022-06-17 12:49:57 +0200 |
---|---|---|
committer | Stefan Kangas <stefan@marxist.se> | 2022-06-17 13:12:03 +0200 |
commit | abdc5887c1fb81ec7ce22d0645e4dfa10f9eee29 (patch) | |
tree | 6632746bf145609f683e4adf535c1d803b5ffd94 /lisp/bookmark.el | |
parent | 77c7a79a3fcc0ace2b58ae21b9fcb93bf536d923 (diff) | |
download | emacs-abdc5887c1fb81ec7ce22d0645e4dfa10f9eee29.tar.gz |
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.
Diffstat (limited to 'lisp/bookmark.el')
-rw-r--r-- | lisp/bookmark.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index b0b54e52d88..4a8ffc0fa07 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)) |