Don't repeat at load time any bindings that are autoloaded.

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)

lisp/dabbrev.el

@@ -205,8 +205,7 @@ with the next possible expansion not yet tried."
       (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.  

lisp/edmacro.el

@@ -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

lisp/macros.el

@@ -235,7 +235,6 @@ and then select the region of un-tablified names and use
       (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