diff options
author | Richard M. Stallman <rms@gnu.org> | 1995-06-17 23:53:53 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1995-06-17 23:53:53 +0000 |
commit | 0f994ab3f98cf9ac2e9d82e8558383f4622ab34c (patch) | |
tree | 5d6b7dd2eb032bed36f7dc5a9b353b2e4212c9f9 /lisp/startup.el | |
parent | e97d722cd6474a457094dd05bbb7cf028b4eff51 (diff) | |
download | emacs-0f994ab3f98cf9ac2e9d82e8558383f4622ab34c.tar.gz |
(normal-top-level, command-line-1):
Call precompute-menubar-bindings only if using x.
(precompute-menubar-bindings): Don't check for x here.
Set define-key-rebound-commands to t.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r-- | lisp/startup.el | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 9b73e40a59d..6b636f54516 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -295,19 +295,20 @@ specified by the LC_ALL, LC_CTYPE and LANG environment variables.") (and window-setup-hook (run-hooks 'window-setup-hook)) (or menubar-bindings-done - (precompute-menubar-bindings)))))) + (if (eq window-system 'x) + (precompute-menubar-bindings))))))) ;; Precompute the keyboard equivalents in the menu bar items. (defun precompute-menubar-bindings () - (if (eq window-system 'x) - (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)))) - (x-popup-menu nil (cdr (cdr (car submap))))) - (setq submap (cdr submap)))))) + (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)))) + (x-popup-menu nil (cdr (cdr (car submap))))) + (setq submap (cdr submap)))) + (setq define-key-rebound-commands t)) (defun command-line () (setq command-line-default-directory default-directory) @@ -590,7 +591,8 @@ specified by the LC_ALL, LC_CTYPE and LANG environment variables.") (setq window-setup-hook nil) ;; Do this now to avoid an annoying delay if the user ;; clicks the menu bar during the sit-for. - (precompute-menubar-bindings) + (if (eq window-system 'x) + (precompute-menubar-bindings)) (setq menubar-bindings-done t) (unwind-protect (progn |