summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Voelker <voelker@cs.washington.edu>1996-12-09 23:38:03 +0000
committerGeoff Voelker <voelker@cs.washington.edu>1996-12-09 23:38:03 +0000
commitc88dec46e99988407be4d5f6ab22dc91ad60ca02 (patch)
tree5cb810aff33d29f90725a61f79b52d55494b5ca2
parent57d93ebaa8220f0b3ad4e06dd3fab8dbd75947c1 (diff)
downloademacs-c88dec46e99988407be4d5f6ab22dc91ad60ca02.tar.gz
(normal-top-level, command-line, command-line-1):
User w32 instead of ms-windows for window-system symbol.
-rw-r--r--lisp/startup.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index a4c98f38524..979f7106627 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -378,7 +378,7 @@ from being initialized.")
(and window-setup-hook
(run-hooks 'window-setup-hook))
(or menubar-bindings-done
- (if (memq window-system '(x ms-windows))
+ (if (memq window-system '(x w32))
(precompute-menubar-bindings)))))))
;; Precompute the keyboard equivalents in the menu bar items.
@@ -536,7 +536,7 @@ from being initialized.")
(if (fboundp 'frame-initialize)
(frame-initialize))
;; If frame was created with a menu bar, set menu-bar-mode on.
- (if (or (not (memq window-system '(x ms-windows)))
+ (if (or (not (memq window-system '(x w32)))
(> (cdr (assq 'menu-bar-lines (frame-parameters))) 0))
(menu-bar-mode t))
@@ -688,7 +688,7 @@ from being initialized.")
(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 (memq window-system '(x ms-windows))
+ (if (memq window-system '(x w32))
(precompute-menubar-bindings))
(setq menubar-bindings-done t)
(unwind-protect