Mercurial > emacs
changeset 52103:1ffb07fde6de
Don't redo key bindings on loading, put them only in loaddefs.el.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sat, 02 Aug 2003 22:05:00 +0000 |
| parents | 3582fa41d83a |
| children | 6ca7d9dfe5d5 |
| files | lisp/bookmark.el lisp/dabbrev.el lisp/emerge.el lisp/textmodes/ispell.el |
| diffstat | 4 files changed, 53 insertions(+), 87 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/bookmark.el Sat Aug 02 20:36:51 2003 +0000 +++ b/lisp/bookmark.el Sat Aug 02 22:05:00 2003 +0000 @@ -1,6 +1,6 @@ ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001 Free Software Foundation +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2003 Free Software Foundation ;; Author: Karl Fogel <kfogel@red-bean.com> ;; Maintainer: Karl Fogel <kfogel@red-bean.com> @@ -234,34 +234,21 @@ key of your choice to `bookmark-map'. All interactive bookmark functions have a binding in this keymap.") -;;;###autoload -(define-prefix-command 'bookmark-map) +;;;###autoload (define-prefix-command 'bookmark-map) ;; Read the help on all of these functions for details... -;;;###autoload -(define-key bookmark-map "x" 'bookmark-set) -;;;###autoload -(define-key bookmark-map "m" 'bookmark-set) ; "m" for "mark" -;;;###autoload -(define-key bookmark-map "j" 'bookmark-jump) -;;;###autoload -(define-key bookmark-map "g" 'bookmark-jump) ; "g" for "go" -;;;###autoload -(define-key bookmark-map "i" 'bookmark-insert) -;;;###autoload -(define-key bookmark-map "e" 'edit-bookmarks) -;;;###autoload -(define-key bookmark-map "f" 'bookmark-insert-location) ; "f" for "find" -;;;###autoload -(define-key bookmark-map "r" 'bookmark-rename) -;;;###autoload -(define-key bookmark-map "d" 'bookmark-delete) -;;;###autoload -(define-key bookmark-map "l" 'bookmark-load) -;;;###autoload -(define-key bookmark-map "w" 'bookmark-write) -;;;###autoload -(define-key bookmark-map "s" 'bookmark-save) +;;;###autoload (define-key bookmark-map "x" 'bookmark-set) +;;;###autoload (define-key bookmark-map "m" 'bookmark-set) ; "m" for "mark" +;;;###autoload (define-key bookmark-map "j" 'bookmark-jump) +;;;###autoload (define-key bookmark-map "g" 'bookmark-jump) ; "g" for "go" +;;;###autoload (define-key bookmark-map "i" 'bookmark-insert) +;;;###autoload (define-key bookmark-map "e" 'edit-bookmarks) +;;;###autoload (define-key bookmark-map "f" 'bookmark-insert-location) ; "f" for "find" +;;;###autoload (define-key bookmark-map "r" 'bookmark-rename) +;;;###autoload (define-key bookmark-map "d" 'bookmark-delete) +;;;###autoload (define-key bookmark-map "l" 'bookmark-load) +;;;###autoload (define-key bookmark-map "w" 'bookmark-write) +;;;###autoload (define-key bookmark-map "s" 'bookmark-save) ;;; The annotation maps. @@ -2226,45 +2213,35 @@ (cons 'bookmark menu-bar-final-items))) (setq menu-bar-final-items '(bookmark))) -;;;###autoload -(define-key menu-bar-bookmark-map [load] - '("Load a Bookmark File..." . bookmark-load)) +;;;###autoload (define-key menu-bar-bookmark-map [load] +;;;###autoload '("Load a Bookmark File..." . bookmark-load)) -;;;###autoload -(define-key menu-bar-bookmark-map [write] - '("Save Bookmarks As..." . bookmark-write)) +;;;###autoload (define-key menu-bar-bookmark-map [write] +;;;###autoload '("Save Bookmarks As..." . bookmark-write)) -;;;###autoload -(define-key menu-bar-bookmark-map [save] - '("Save Bookmarks" . bookmark-save)) +;;;###autoload (define-key menu-bar-bookmark-map [save] +;;;###autoload '("Save Bookmarks" . bookmark-save)) -;;;###autoload -(define-key menu-bar-bookmark-map [edit] - '("Edit Bookmark List" . bookmark-bmenu-list)) +;;;###autoload (define-key menu-bar-bookmark-map [edit] +;;;###autoload '("Edit Bookmark List" . bookmark-bmenu-list)) -;;;###autoload -(define-key menu-bar-bookmark-map [delete] - '("Delete Bookmark" . bookmark-menu-delete)) +;;;###autoload (define-key menu-bar-bookmark-map [delete] +;;;###autoload '("Delete Bookmark" . bookmark-menu-delete)) -;;;###autoload -(define-key menu-bar-bookmark-map [rename] - '("Rename Bookmark" . bookmark-menu-rename)) +;;;###autoload (define-key menu-bar-bookmark-map [rename] +;;;###autoload '("Rename Bookmark" . bookmark-menu-rename)) -;;;###autoload -(define-key menu-bar-bookmark-map [locate] - '("Insert Location" . bookmark-menu-locate)) +;;;###autoload (define-key menu-bar-bookmark-map [locate] +;;;###autoload '("Insert Location" . bookmark-menu-locate)) -;;;###autoload -(define-key menu-bar-bookmark-map [insert] - '("Insert Contents" . bookmark-menu-insert)) +;;;###autoload (define-key menu-bar-bookmark-map [insert] +;;;###autoload '("Insert Contents" . bookmark-menu-insert)) -;;;###autoload -(define-key menu-bar-bookmark-map [set] - '("Set Bookmark" . bookmark-set)) +;;;###autoload (define-key menu-bar-bookmark-map [set] +;;;###autoload '("Set Bookmark" . bookmark-set)) -;;;###autoload -(define-key menu-bar-bookmark-map [jump] - '("Jump to Bookmark" . bookmark-menu-jump)) +;;;###autoload (define-key menu-bar-bookmark-map [jump] +;;;###autoload '("Jump to Bookmark" . bookmark-menu-jump)) ;;;; end bookmark menu stuff ;;;;
--- a/lisp/dabbrev.el Sat Aug 02 20:36:51 2003 +0000 +++ b/lisp/dabbrev.el Sat Aug 02 22:05:00 2003 +0000 @@ -1,6 +1,6 @@ ;;; dabbrev.el --- dynamic abbreviation package -;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000, 2001 +;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000, 01, 2003 ;; Free Software Foundation, Inc. ;; Author: Don Morrison @@ -357,11 +357,9 @@ ;; Exported functions ;;---------------------------------------------------------------- -;;;###autoload -(define-key esc-map "/" 'dabbrev-expand) +;;;###autoload (define-key esc-map "/" 'dabbrev-expand) ;;;??? Do we want this? -;;;###autoload -(define-key esc-map [?\C-/] 'dabbrev-completion) +;;;###autoload (define-key esc-map [?\C-/] 'dabbrev-completion) ;;;###autoload (defun dabbrev-completion (&optional arg)
--- a/lisp/emerge.el Sat Aug 02 20:36:51 2003 +0000 +++ b/lisp/emerge.el Sat Aug 02 22:05:00 2003 +0000 @@ -27,30 +27,22 @@ ;;;###autoload (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge")) -;;;###autoload -(fset 'menu-bar-emerge-menu (symbol-value 'menu-bar-emerge-menu)) +;;;###autoload (fset 'menu-bar-emerge-menu (symbol-value 'menu-bar-emerge-menu)) -;;;###autoload -(define-key menu-bar-emerge-menu [emerge-merge-directories] - '("Merge Directories..." . emerge-merge-directories)) -;;;###autoload -(define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor] - '("Revisions with Ancestor..." . emerge-revisions-with-ancestor)) -;;;###autoload -(define-key menu-bar-emerge-menu [emerge-revisions] - '("Revisions..." . emerge-revisions)) -;;;###autoload -(define-key menu-bar-emerge-menu [emerge-files-with-ancestor] - '("Files with Ancestor..." . emerge-files-with-ancestor)) -;;;###autoload -(define-key menu-bar-emerge-menu [emerge-files] - '("Files..." . emerge-files)) -;;;###autoload -(define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor] - '("Buffers with Ancestor..." . emerge-buffers-with-ancestor)) -;;;###autoload -(define-key menu-bar-emerge-menu [emerge-buffers] - '("Buffers..." . emerge-buffers)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-merge-directories] +;;;###autoload '("Merge Directories..." . emerge-merge-directories)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor] +;;;###autoload '("Revisions with Ancestor..." . emerge-revisions-with-ancestor)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-revisions] +;;;###autoload '("Revisions..." . emerge-revisions)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-files-with-ancestor] +;;;###autoload '("Files with Ancestor..." . emerge-files-with-ancestor)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-files] +;;;###autoload '("Files..." . emerge-files)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor] +;;;###autoload '("Buffers with Ancestor..." . emerge-buffers-with-ancestor)) +;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers] +;;;###autoload '("Buffers..." . emerge-buffers)) ;;; Macros
--- a/lisp/textmodes/ispell.el Sat Aug 02 20:36:51 2003 +0000 +++ b/lisp/textmodes/ispell.el Sat Aug 02 22:05:00 2003 +0000 @@ -1264,8 +1264,7 @@ -;;;###autoload -(define-key esc-map "$" 'ispell-word) +;;;###autoload (define-key esc-map "$" 'ispell-word) (defun ispell-accept-output (&optional timeout-secs timeout-msecs)