[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0b5301fceb 2/4: Inherit instead of copying keymap in bookmark.el
From: |
Stefan Kangas |
Subject: |
master 0b5301fceb 2/4: Inherit instead of copying keymap in bookmark.el |
Date: |
Mon, 4 Jul 2022 11:02:15 -0400 (EDT) |
branch: master
commit 0b5301fceb7a4a86551ca41e2271c5189e150d87
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Inherit instead of copying keymap in bookmark.el
* lisp/bookmark.el (bookmark-rename): Inherit instead of copying
keymap.
---
lisp/bookmark.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 126c25966c..7138822447 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -216,10 +216,10 @@ A non-nil value may result in truncated bookmark names."
;; Set up these bindings dumping time *only*;
;; if the user alters them, don't override the user when loading bookmark.el.
-;;;###autoload (define-key ctl-x-r-map "b" 'bookmark-jump)
-;;;###autoload (define-key ctl-x-r-map "m" 'bookmark-set)
-;;;###autoload (define-key ctl-x-r-map "M" 'bookmark-set-no-overwrite)
-;;;###autoload (define-key ctl-x-r-map "l" 'bookmark-bmenu-list)
+;;;###autoload (keymap-set ctl-x-r-map "b" #'bookmark-jump)
+;;;###autoload (keymap-set ctl-x-r-map "m" #'bookmark-set)
+;;;###autoload (keymap-set ctl-x-r-map "M" #'bookmark-set-no-overwrite)
+;;;###autoload (keymap-set ctl-x-r-map "l" #'bookmark-bmenu-list)
;;;###autoload
(defvar-keymap bookmark-map
@@ -1436,9 +1436,9 @@ name."
(read-from-minibuffer
"New name: "
nil
- (let ((now-map (copy-keymap minibuffer-local-map)))
- (define-key now-map "\C-w" 'bookmark-yank-word)
- now-map)
+ (define-keymap
+ :parent minibuffer-local-map
+ "C-w" #'bookmark-yank-word)
nil
'bookmark-history))))
(bookmark-set-name old-name final-new-name)