From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 6 Oct 2000 11:42:45 +0000 (+0000)
Subject: (command-line): For now, activate tool-bar-mode only
X-Git-Tag: emacs-pretest-21.0.90~1110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65d425aca59cacf22b7fd11fc7c911892cedeff3;p=emacs.git

(command-line): For now, activate tool-bar-mode only
if XPM images are supported.
---

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'."
   ;; If frame was created with a tool bar, switch tool-bar-mode on.
   (when (and (not noninteractive)
 	     (memq window-system '(x w32))
+	     (image-type-available-p 'xpm)
 	     (> (frame-parameter nil 'tool-bar-lines) 0))
     (tool-bar-mode t))