aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Fogel2007-07-13 18:16:17 +0000
committerKarl Fogel2007-07-13 18:16:17 +0000
commite4f6f302a59b097dd77bc6f2328f5eb6e239ea1a (patch)
treedbdbab2e0d01a0584f0815aab3d982300799fc4b
parent8ca3a1ea8446b3daf4717dd8ea6fb153cbfba5b9 (diff)
downloademacs-e4f6f302a59b097dd77bc6f2328f5eb6e239ea1a.tar.gz
emacs-e4f6f302a59b097dd77bc6f2328f5eb6e239ea1a.zip
* 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.
-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 @@
12007-07-13 Karl Fogel <kfogel@red-bean.com>
2
3 * bookmark.el: Don't define bookmark keys under the "C-xr" map;
4 instead, make "C-xp" a prefix for bookmark-map. Patch by Drew
5 Adams <drew.adams{_AT_}oracle.com>, mildly tweaked by me. See
6 http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html.
7
12007-07-13 Carsten Dominik <dominik@science.uva.nl> 82007-07-13 Carsten Dominik <dominik@science.uva.nl>
2 9
3 * textmodes/org.el: Bug fixes. 10 * 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:
224;; Set up these bindings dumping time *only*; 224;; Set up these bindings dumping time *only*;
225;; if the user alters them, don't override the user when loading bookmark.el. 225;; if the user alters them, don't override the user when loading bookmark.el.
226 226
227;;;###autoload (define-key ctl-x-map "rb" 'bookmark-jump)
228;;;###autoload (define-key ctl-x-map "rm" 'bookmark-set)
229;;;###autoload (define-key ctl-x-map "rl" 'bookmark-bmenu-list)
230
231;;;###autoload 227;;;###autoload
232(defvar bookmark-map nil 228(defvar bookmark-map nil
233 "Keymap containing bindings to bookmark functions. 229 "Keymap containing bindings to bookmark functions.
@@ -238,6 +234,8 @@ functions have a binding in this keymap.")
238 234
239;;;###autoload (define-prefix-command 'bookmark-map) 235;;;###autoload (define-prefix-command 'bookmark-map)
240 236
237;;;###autoload (define-key ctl-x-map "p" bookmark-map)
238
241;; Read the help on all of these functions for details... 239;; Read the help on all of these functions for details...
242;;;###autoload (define-key bookmark-map "x" 'bookmark-set) 240;;;###autoload (define-key bookmark-map "x" 'bookmark-set)
243;;;###autoload (define-key bookmark-map "m" 'bookmark-set) ; "m" for "mark" 241;;;###autoload (define-key bookmark-map "m" 'bookmark-set) ; "m" for "mark"