summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/bookmark.el6
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6cc633b153..942f4468451 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-13 Karl Fogel <kfogel@red-bean.com>
+
+ * bookmark.el: Don't define bookmark keys under the "C-xr" map;
+ instead, make "C-xp" a prefix for bookmark-map. Patch by Drew
+ Adams <drew.adams{_AT_}oracle.com>, mildly tweaked by me. See
+ http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html.
+
2007-07-13 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el: Bug fixes.
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 3c1469fef97..156e8affaa5 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -224,10 +224,6 @@ following in your `.emacs' file:
;; 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-map "rb" 'bookmark-jump)
-;;;###autoload (define-key ctl-x-map "rm" 'bookmark-set)
-;;;###autoload (define-key ctl-x-map "rl" 'bookmark-bmenu-list)
-
;;;###autoload
(defvar bookmark-map nil
"Keymap containing bindings to bookmark functions.
@@ -238,6 +234,8 @@ functions have a binding in this keymap.")
;;;###autoload (define-prefix-command 'bookmark-map)
+;;;###autoload (define-key ctl-x-map "p" bookmark-map)
+
;; Read the help on all of these functions for details...
;;;###autoload (define-key bookmark-map "x" 'bookmark-set)
;;;###autoload (define-key bookmark-map "m" 'bookmark-set) ; "m" for "mark"