From: Geoff Voelker <voelker@cs.washington.edu>
Date: Mon, 9 Dec 1996 23:38:03 +0000 (+0000)
Subject: (normal-top-level, command-line, command-line-1):
X-Git-Tag: emacs-20.1~3292
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2da0d7db99125056997ecfc6ce0a821faf9ea8ea;p=emacs.git

(normal-top-level, command-line, command-line-1):
User w32 instead of ms-windows for window-system symbol.
---

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