diff options
| author | Gerd Moellmann | 2000-10-06 11:42:45 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-10-06 11:42:45 +0000 |
| commit | 65d425aca59cacf22b7fd11fc7c911892cedeff3 (patch) | |
| tree | 3191779d17c2526bd0e9770ae5684e5281a0035a | |
| parent | 301d6830c03eb60056b1f6ac84965cc7c6ab3604 (diff) | |
| download | emacs-65d425aca59cacf22b7fd11fc7c911892cedeff3.tar.gz emacs-65d425aca59cacf22b7fd11fc7c911892cedeff3.zip | |
(command-line): For now, activate tool-bar-mode only
if XPM images are supported.
| -rw-r--r-- | lisp/startup.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index fb8e8b44c2c..7ce43e20898 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -655,6 +655,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." | |||
| 655 | ;; If frame was created with a tool bar, switch tool-bar-mode on. | 655 | ;; If frame was created with a tool bar, switch tool-bar-mode on. |
| 656 | (when (and (not noninteractive) | 656 | (when (and (not noninteractive) |
| 657 | (memq window-system '(x w32)) | 657 | (memq window-system '(x w32)) |
| 658 | (image-type-available-p 'xpm) | ||
| 658 | (> (frame-parameter nil 'tool-bar-lines) 0)) | 659 | (> (frame-parameter nil 'tool-bar-lines) 0)) |
| 659 | (tool-bar-mode t)) | 660 | (tool-bar-mode t)) |
| 660 | 661 | ||