Mercurial > emacs
changeset 5307:069c54e77fd1
Don't repeat at load time any bindings that are autoloaded.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 23 Dec 1993 04:52:56 +0000 |
parents | a2f8f9c4e29b |
children | f14639c69ed3 |
files | lisp/bookmark.el lisp/dabbrev.el lisp/edmacro.el lisp/macros.el |
diffstat | 4 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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.
--- 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
--- 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