Mercurial > emacs
comparison lisp/startup.el @ 40304:ccd5c473ddcf
(normal-top-level): Check for frame-initial-frame
only if it's really used.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 25 Oct 2001 13:32:29 +0000 |
| parents | d9591551229b |
| children | 1e181d033e29 |
comparison
equal
deleted
inserted
replaced
| 40303:a725c601ef70 | 40304:ccd5c473ddcf |
|---|---|
| 483 (and term-setup-hook | 483 (and term-setup-hook |
| 484 (run-hooks 'term-setup-hook)) | 484 (run-hooks 'term-setup-hook)) |
| 485 | 485 |
| 486 ;; Don't do this if we failed to create the initial frame, | 486 ;; Don't do this if we failed to create the initial frame, |
| 487 ;; for instance due to a dense colormap. | 487 ;; for instance due to a dense colormap. |
| 488 (when frame-initial-frame | 488 (when (or frame-initial-frame |
| 489 ;; If frame-initial-frame has no meaning, do this anyway. | |
| 490 (not (and window-system | |
| 491 (not noninteractive) | |
| 492 (not (eq window-system 'pc))))) | |
| 489 ;; Modify the initial frame based on what .emacs puts into | 493 ;; Modify the initial frame based on what .emacs puts into |
| 490 ;; ...-frame-alist. | 494 ;; ...-frame-alist. |
| 491 (if (fboundp 'frame-notice-user-settings) | 495 (if (fboundp 'frame-notice-user-settings) |
| 492 (frame-notice-user-settings)) | 496 (frame-notice-user-settings)) |
| 493 (if (fboundp 'frame-set-background-mode) | 497 (if (fboundp 'frame-set-background-mode) |