summaryrefslogtreecommitdiff
path: root/lisp/bookmark.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1993-12-23 04:52:56 +0000
committerRichard M. Stallman <rms@gnu.org>1993-12-23 04:52:56 +0000
commitecc21289e11bcbfb7d6f5a976ad47cc4f8904ea3 (patch)
tree581ae1c9a9b0894a18250fed76099ba95a4289ef /lisp/bookmark.el
parent1e3af4e87f58d8f9bb6d299355d9ea3c29dae643 (diff)
downloademacs-ecc21289e11bcbfb7d6f5a976ad47cc4f8904ea3.tar.gz
Don't repeat at load time any bindings that are autoloaded.
Diffstat (limited to 'lisp/bookmark.el')
-rw-r--r--lisp/bookmark.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 24dc1fc8f40..a44e2153aa0 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -106,7 +106,8 @@
;; These are the distribution keybindings suggested by RMS, everything
;; else will be done with M-x or the menubar:
;;;###autoload
-(if (symbolp (key-binding "\C-xr"))
+(if (or (symbolp (key-binding "\C-xr"))
+ (fboundp 'bookmark-set))
nil
(progn (define-key ctl-x-map "rb" 'bookmark-jump)
(define-key ctl-x-map "rm" 'bookmark-set)