# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 756622376 0
# Node ID 069c54e77fd16602373e589aac2e734fccf85a86
# Parent  a2f8f9c4e29b162a66f4c3cf8298df92c6e5605f
Don't repeat at load time any bindings that are autoloaded.

diff -r a2f8f9c4e29b -r 069c54e77fd1 lisp/bookmark.el
--- a/lisp/bookmark.el	Thu Dec 23 04:47:13 1993 +0000
+++ b/lisp/bookmark.el	Thu Dec 23 04:52:56 1993 +0000
@@ -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)
diff -r a2f8f9c4e29b -r 069c54e77fd1 lisp/dabbrev.el
--- a/lisp/dabbrev.el	Thu Dec 23 04:47:13 1993 +0000
+++ b/lisp/dabbrev.el	Thu Dec 23 04:52:56 1993 +0000
@@ -205,8 +205,7 @@
       (setq last-dabbrevs-expansion expansion)
       (setq last-dabbrevs-expansion-location loc))))
 
-;;;###autoload
-(define-key esc-map "/" 'dabbrev-expand)
+;;;###autoload (define-key esc-map "/" 'dabbrev-expand)
 
 
 ;; Search function used by dabbrevs library.  
diff -r a2f8f9c4e29b -r 069c54e77fd1 lisp/edmacro.el
--- a/lisp/edmacro.el	Thu Dec 23 04:47:13 1993 +0000
+++ b/lisp/edmacro.el	Thu Dec 23 04:52:56 1993 +0000
@@ -74,7 +74,6 @@
 ;;; The user-level commands for editing macros.
 
 ;;;###autoload (define-key ctl-x-map "\C-k" 'edit-kbd-macro)
-(define-key ctl-x-map "\C-k" 'edit-kbd-macro)
 
 ;;;###autoload
 (defvar edmacro-eight-bits nil
diff -r a2f8f9c4e29b -r 069c54e77fd1 lisp/macros.el
--- a/lisp/macros.el	Thu Dec 23 04:47:13 1993 +0000
+++ b/lisp/macros.el	Thu Dec 23 04:52:56 1993 +0000
@@ -235,7 +235,6 @@
       (set-marker end-marker nil)
       (set-marker next-line-marker nil))))
 
-;;;###autoload
-(define-key ctl-x-map "q" 'kbd-macro-query)
+;;;###autoload (define-key ctl-x-map "q" 'kbd-macro-query)
 
 ;;; macros.el ends here