diff options
| -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 a4c98f38524..979f7106627 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -378,7 +378,7 @@ from being initialized.") | |||
| 378 | (and window-setup-hook | 378 | (and window-setup-hook |
| 379 | (run-hooks 'window-setup-hook)) | 379 | (run-hooks 'window-setup-hook)) |
| 380 | (or menubar-bindings-done | 380 | (or menubar-bindings-done |
| 381 | (if (memq window-system '(x ms-windows)) | 381 | (if (memq window-system '(x w32)) |
| 382 | (precompute-menubar-bindings))))))) | 382 | (precompute-menubar-bindings))))))) |
| 383 | 383 | ||
| 384 | ;; Precompute the keyboard equivalents in the menu bar items. | 384 | ;; Precompute the keyboard equivalents in the menu bar items. |
| @@ -536,7 +536,7 @@ from being initialized.") | |||
| 536 | (if (fboundp 'frame-initialize) | 536 | (if (fboundp 'frame-initialize) |
| 537 | (frame-initialize)) | 537 | (frame-initialize)) |
| 538 | ;; If frame was created with a menu bar, set menu-bar-mode on. | 538 | ;; If frame was created with a menu bar, set menu-bar-mode on. |
| 539 | (if (or (not (memq window-system '(x ms-windows))) | 539 | (if (or (not (memq window-system '(x w32))) |
| 540 | (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0)) | 540 | (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0)) |
| 541 | (menu-bar-mode t)) | 541 | (menu-bar-mode t)) |
| 542 | 542 | ||
| @@ -688,7 +688,7 @@ from being initialized.") | |||
| 688 | (setq window-setup-hook nil) | 688 | (setq window-setup-hook nil) |
| 689 | ;; Do this now to avoid an annoying delay if the user | 689 | ;; Do this now to avoid an annoying delay if the user |
| 690 | ;; clicks the menu bar during the sit-for. | 690 | ;; clicks the menu bar during the sit-for. |
| 691 | (if (memq window-system '(x ms-windows)) | 691 | (if (memq window-system '(x w32)) |
| 692 | (precompute-menubar-bindings)) | 692 | (precompute-menubar-bindings)) |
| 693 | (setq menubar-bindings-done t) | 693 | (setq menubar-bindings-done t) |
| 694 | (unwind-protect | 694 | (unwind-protect |