(tool-bar-mode): Make it a no-op if images

aren't supported.  This avoids the annoying grey strip drawn by
the Windows version instead of the missing tool bar.

2 files changed, 22 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cc2c1c91e6..b61de530510 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-30  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * toolbar/tool-bar.el (tool-bar-mode): Make it a no-op if images
+        aren't supported.  This avoids the annoying gray strip drawn by
+        the Windows version instead of the missing tool bar.
+
 2001-08-29  Gerd Moellmann  <gerd@gnu.org>
 
         * menu-bar.el (menu-bar-options-menu): Make option text, messages
diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index d3cd8749a2f..c4e548ef7e7 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -50,21 +50,22 @@ conveniently adding tool bar items."
   :global t
   :group 'mouse
   :group 'frames
-  (let ((lines (if tool-bar-mode 1 0)))
-    ;; Alter existing frames...
-    (mapc (lambda (frame)
-            (modify-frame-parameters frame
-                                     (list (cons 'tool-bar-lines lines))))
-          (frame-list))
-    ;; ...and future ones.
-    (let ((elt (assq 'tool-bar-lines default-frame-alist)))
-      (if elt
-          (setcdr elt lines)
-        (add-to-list 'default-frame-alist (cons 'tool-bar-lines lines)))))
-  (if (and tool-bar-mode
-           (display-graphic-p)
-           (= 1 (length (default-value 'tool-bar-map)))) ; not yet setup
-      (tool-bar-setup)))
+  (and (display-images-p)
+       (let ((lines (if tool-bar-mode 1 0)))
+         ;; Alter existing frames...
+         (mapc (lambda (frame)
+                 (modify-frame-parameters frame
+                                          (list (cons 'tool-bar-lines lines))))
+               (frame-list))
+         ;; ...and future ones.
+         (let ((elt (assq 'tool-bar-lines default-frame-alist)))
+           (if elt
+               (setcdr elt lines)
+             (add-to-list 'default-frame-alist (cons 'tool-bar-lines lines)))))
+       (if (and tool-bar-mode
+                (display-graphic-p)
+                (= 1 (length (default-value 'tool-bar-map)))) ; not yet setup
+           (tool-bar-setup))))
 
 (defvar tool-bar-map (make-sparse-keymap)
   "Keymap for the tool bar.