diff options
| author | Geoff Voelker <voelker@cs.washington.edu> | 1995-11-07 07:47:22 +0000 |
|---|---|---|
| committer | Geoff Voelker <voelker@cs.washington.edu> | 1995-11-07 07:47:22 +0000 |
| commit | b515f2d082ce9c00c40b98bb08bfeb9eb775cf7d (patch) | |
| tree | 19e2b52380847c607e18a8524b14bc10f9477074 /lisp/startup.el | |
| parent | 6052f6c60abf76780f95f344bdc2e7bfec1ec724 (diff) | |
| download | emacs-b515f2d082ce9c00c40b98bb08bfeb9eb775cf7d.tar.gz | |
[win32] (normal-top-level, command-line, command-line-1):
Test for 'win32 window system as well as 'x.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 0917557a497..c387b519d8e 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -301,7 +301,7 @@ this prefix to create a unique file name.") (and window-setup-hook (run-hooks 'window-setup-hook)) (or menubar-bindings-done - (if (eq window-system 'x) + (if (or (eq window-system 'x) (eq window-system 'win32)) (precompute-menubar-bindings))))))) ;; Precompute the keyboard equivalents in the menu bar items. @@ -456,7 +456,7 @@ this prefix to create a unique file name.") (if (fboundp 'frame-initialize) (frame-initialize)) ;; If frame was created with a menu bar, set menu-bar-mode on. - (if (or (not (eq window-system 'x)) + (if (or (not (or (eq window-system 'x) (eq window-system 'win32))) (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0)) (menu-bar-mode t)) @@ -606,7 +606,7 @@ this prefix to create a unique file name.") (setq window-setup-hook nil) ;; Do this now to avoid an annoying delay if the user ;; clicks the menu bar during the sit-for. - (if (eq window-system 'x) + (if (or (eq window-system 'x) (eq window-system 'win32)) (precompute-menubar-bindings)) (setq menubar-bindings-done t) (unwind-protect |