diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-10 18:19:03 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-10 18:19:03 +0000 |
| commit | 50d4ba399303b7365b03cdd3456a28eae3451fa0 (patch) | |
| tree | c63ce12cfa63ee99c330b5ab7c3cd3d5f3b0f73d /lisp/startup.el | |
| parent | deeb21d4d76909c91f4f94f1fa1bbc782fb5f75a (diff) | |
| download | emacs-50d4ba399303b7365b03cdd3456a28eae3451fa0.tar.gz | |
* keyboard.c (Qmenu_alias, Vdefine_key_rebound_commands): Remove.
(parse_menu_item): Streamline since bindings are recomputed all the
time anyway. Don't bother checking Vdefine_key_rebound_commands any
more and don't support lmenu's menu-alias any more either.
* subr.el (define-key-rebound-commands): Mark obsolete.
* startup.el (precompute-menubar-bindings): Remove.
(normal-top-level): Remove obsolete code that tried to precompute
menubar bindings.
* loadup.el (define-key-rebound-commands): Don't bother fiddling with
define-key-rebound-commands and precompute-menubar-bindings.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 1d534d12e09..a260cd7c579 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -501,8 +501,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (delete (concat "PWD=" pwd) process-environment))))) (setq default-directory (abbreviate-file-name default-directory)) - (let ((menubar-bindings-done nil) - (old-face-font-rescale-alist face-font-rescale-alist)) + (let ((old-face-font-rescale-alist face-font-rescale-alist)) (unwind-protect (command-line) ;; Do this again, in case .emacs defined more abbreviations. @@ -571,10 +570,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (if (fboundp 'font-menu-add-default) (font-menu-add-default)) (and window-setup-hook - (run-hooks 'window-setup-hook)) - (or menubar-bindings-done - (if (display-popup-menus-p) - (precompute-menubar-bindings))))) + (run-hooks 'window-setup-hook)))) ;; Subprocesses of Emacs do not have direct access to the terminal, so ;; unless told otherwise they should only assume a dumb terminal. ;; We are careful to do it late (after term-setup-hook), although the @@ -595,20 +591,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (delete display process-environment))))) ;; Precompute the keyboard equivalents in the menu bar items. -(defun precompute-menubar-bindings () - (let ((submap (lookup-key global-map [menu-bar]))) - (while submap - (and (consp (car submap)) - (symbolp (car (car submap))) - (stringp (car-safe (cdr (car submap)))) - (keymapp (cdr (cdr (car submap)))) - (progn - (x-popup-menu nil (cdr (cdr (car submap)))) - (if purify-flag - (garbage-collect)))) - (setq submap (cdr submap)))) - (setq define-key-rebound-commands t)) - ;; Command-line options supported by tty's: (defconst tty-long-option-alist '(("--name" . "-name") |