Mercurial > emacs
comparison lisp/startup.el @ 16652:eb3f3934a185
(normal-top-level, command-line, command-line-1):
User w32 instead of ms-windows for window-system symbol.
author | Geoff Voelker <voelker@cs.washington.edu> |
---|---|
date | Mon, 09 Dec 1996 23:38:03 +0000 |
parents | 20a63f6713dc |
children | 049c87a96dca |
comparison
equal
deleted
inserted
replaced
16651:e7449d679e72 | 16652:eb3f3934a185 |
---|---|
376 (if (fboundp 'font-menu-add-default) | 376 (if (fboundp 'font-menu-add-default) |
377 (font-menu-add-default)) | 377 (font-menu-add-default)) |
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. |
385 (defun precompute-menubar-bindings () | 385 (defun precompute-menubar-bindings () |
386 (let ((submap (lookup-key global-map [menu-bar]))) | 386 (let ((submap (lookup-key global-map [menu-bar]))) |
534 (if (fboundp 'face-initialize) | 534 (if (fboundp 'face-initialize) |
535 (face-initialize)) | 535 (face-initialize)) |
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 |
543 (run-hooks 'before-init-hook) | 543 (run-hooks 'before-init-hook) |
544 | 544 |
686 (and window-setup-hook | 686 (and window-setup-hook |
687 (run-hooks 'window-setup-hook)) | 687 (run-hooks 'window-setup-hook)) |
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 |
695 (progn | 695 (progn |
696 ;; The convention for this piece of code is that | 696 ;; The convention for this piece of code is that |