From: Stefan Kangas Date: Fri, 17 Jun 2022 10:49:57 +0000 (+0200) Subject: Use command substitution in bookmark-edit-annotation X-Git-Tag: emacs-29.0.90~1447^2~1687 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=abdc5887c1fb81ec7ce22d0645e4dfa10f9eee29;p=emacs.git 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. --- 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))