diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bookmark.el | 3 | ||||
| -rw-r--r-- | lisp/dabbrev.el | 3 | ||||
| -rw-r--r-- | lisp/edmacro.el | 1 | ||||
| -rw-r--r-- | lisp/macros.el | 3 |
4 files changed, 4 insertions, 6 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) diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index d2f746b6c31..e89e8d13aa7 100644 --- a/lisp/dabbrev.el +++ b/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. diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 78e7406b645..ab2a6c1631f 100644 --- a/lisp/edmacro.el +++ b/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 diff --git a/lisp/macros.el b/lisp/macros.el index c2e8b18b4af..1e093a7630a 100644 --- a/lisp/macros.el +++ b/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 |