From 5fbdc138233792bc3ac18de263f5908c07789cda Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 15 Sep 1996 02:13:16 +0000 Subject: (normal-top-level, command-line-1, command-line): Test for ms-windows instead of win32, and use memq. --- lisp/startup.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lisp/startup.el') diff --git a/lisp/startup.el b/lisp/startup.el index 3bbe20d9a3..a4c98f3852 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 (or (eq window-system 'x) (eq window-system 'win32)) + (if (memq window-system '(x ms-windows)) (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 (or (eq window-system 'x) (eq window-system 'win32))) + (if (or (not (memq window-system '(x ms-windows))) (> (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 (or (eq window-system 'x) (eq window-system 'win32)) + (if (memq window-system '(x ms-windows)) (precompute-menubar-bindings)) (setq menubar-bindings-done t) (unwind-protect -- cgit v1.2.3