Mercurial > emacs
comparison lisp/startup.el @ 109085:6a23dfd2048b
* startup.el (command-line): Don't call tool-bar-setup in a tty-only build.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Thu, 01 Jul 2010 00:58:19 +0200 |
| parents | 5c9de51f68b5 |
| children | ce960720ed3f |
comparison
equal
deleted
inserted
replaced
| 109084:9e474f641740 | 109085:6a23dfd2048b |
|---|---|
| 897 (if (member (x-get-resource "cursorBlink" "CursorBlink") | 897 (if (member (x-get-resource "cursorBlink" "CursorBlink") |
| 898 no-vals) | 898 no-vals) |
| 899 (setq no-blinking-cursor t))))) | 899 (setq no-blinking-cursor t))))) |
| 900 (frame-initialize)) | 900 (frame-initialize)) |
| 901 | 901 |
| 902 ;; Set up the tool-bar (even in tty frames, since Emacs might open a | 902 (when (fboundp 'x-create-frame) |
| 903 ;; graphical frame later). | 903 ;; Set up the tool-bar (even in tty frames, since Emacs might open a |
| 904 (unless noninteractive | 904 ;; graphical frame later). |
| 905 (tool-bar-setup)) | 905 (unless noninteractive |
| 906 (tool-bar-setup))) | |
| 906 | 907 |
| 907 ;; Turn off blinking cursor if so specified in X resources. This is here | 908 ;; Turn off blinking cursor if so specified in X resources. This is here |
| 908 ;; only because all other settings of no-blinking-cursor are here. | 909 ;; only because all other settings of no-blinking-cursor are here. |
| 909 (unless (or noninteractive | 910 (unless (or noninteractive |
| 910 emacs-basic-display | 911 emacs-basic-display |