(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 fb8e8b44c2c15d5f4fbe2b5a9362754491cc5091..7ce43e20898ba030d0738f7b0f597854ada1ba26 100644 (file)
--- 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))