(normal-top-level, command-line, command-line-1):

User w32 instead of ms-windows for window-system symbol.
This commit is contained in:
Geoff Voelker 1996-12-09 23:38:03 +00:00
parent 58cc371087
commit 2da0d7db99

View file

@ -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