Mercurial > emacs
changeset 32436:eaa64e9ff400
(normal-top-level): Use display-popup-menus-p instead
of window-system.
(command-line): Use display-graphic-p instead of window-system.
(command-line-1): Use display-popup-menus-p and display-mouse-p
instead of window-system.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 12 Oct 2000 22:36:37 +0000 |
| parents | 5f41761ecd9d |
| children | 8d3a703c5422 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Thu Oct 12 22:01:56 2000 +0000 +++ b/lisp/startup.el Thu Oct 12 22:36:37 2000 +0000 @@ -479,9 +479,8 @@ (and window-setup-hook (run-hooks 'window-setup-hook)) (or menubar-bindings-done - (if (memq window-system '(x w32)) - (precompute-menubar-bindings) - )))))) + (if (display-popup-menus-p) + (precompute-menubar-bindings))))))) ;; Precompute the keyboard equivalents in the menu bar items. (defun precompute-menubar-bindings () @@ -655,7 +654,7 @@ ;; If frame was created with a tool bar, switch tool-bar-mode on. (when (and (not noninteractive) - (memq window-system '(x w32)) + (display-graphic-p) (> (frame-parameter nil 'tool-bar-lines) 0)) (tool-bar-mode t)) @@ -1092,7 +1091,7 @@ (run-hooks 'window-setup-hook) (setq window-setup-hook nil)) - (when (memq window-system '(x w32)) + (when (display-popup-menus-p) (precompute-menubar-bindings)) (setq menubar-bindings-done t) @@ -1172,9 +1171,7 @@ (insert (substitute-command-keys " Activate menubar \\[tmm-menubar]"))) - ;; Windows and MSDOS (currently) do not count as - ;; window systems, but do have mouse support. - (if window-system + (if (display-mouse-p) (insert " Mode-specific menu C-mouse-3 (third button, with CTRL)")) ;; Many users seem to have problems with these.