(speedbar-use-images, speedbar-update-flag)
authorEli Zaretskii <eliz@gnu.org>
Sun, 28 May 2000 10:52:50 +0000 (10:52 +0000)
committerEli Zaretskii <eliz@gnu.org>
Sun, 28 May 2000 10:52:50 +0000 (10:52 +0000)
(speedbar-easymenu-definition-base): Use display-graphic-p where
available, instead of window-system.

lisp/speedbar.el

index 577a4795e4f251eea64874d216a6f7833a1fded7..f74566fe5a687a41286c9cec25ca2fc7f5b54f5b 100644 (file)
@@ -489,7 +489,9 @@ hierarchy would be replaced with the new directory."
 
 (defcustom speedbar-use-images (and (or (fboundp 'defimage)
                                        (fboundp 'make-image-specifier))
-                                   window-system)
+                                   (if (fboundp 'display-graphic-p)
+                                       (display-graphic-p)
+                                     window-system))
   "*Non nil if speedbar should display icons."
   :group 'speedbar
   :type 'boolean)
@@ -733,7 +735,9 @@ PATH-EXPRESSION to `speedbar-ignored-path-expressions'."
                              (or (fboundp 'run-with-idle-timer)
                                  (fboundp 'start-itimer)
                                  (boundp 'post-command-idle-hook))
-                             window-system)
+                             (if (fboundp 'display-graphic-p)
+                                 (display-graphic-p)
+                               window-system))
   "*Non-nil means to automatically update the display.
 When this is nil then speedbar will not follow the attached frame's path.
 When speedbar is active, use:
@@ -876,7 +880,9 @@ This basically creates a sparse keymap, and makes it's parent be
       :style toggle :selected speedbar-update-flag])
    (if (and (or (fboundp 'defimage)
                (fboundp 'make-image-specifier))
-           window-system)
+           (if (fboundp 'display-graphic-p)
+               (display-graphic-p)
+             window-system))
        (list
        ["Use Images" speedbar-toggle-images
         :style toggle :selected speedbar-use-images]))