[Emacs-diffs] Changes to emacs/lisp/toolbar/tool-bar.el

[Jan Djärv]

Index: emacs/lisp/toolbar/tool-bar.el
diff -c emacs/lisp/toolbar/tool-bar.el:1.34 emacs/lisp/toolbar/tool-bar.el:1.35
*** emacs/lisp/toolbar/tool-bar.el:1.34 Mon May  3 21:48:21 2004
--- emacs/lisp/toolbar/tool-bar.el      Tue Jun  8 17:47:52 2004
***************
*** 118,135 ****
         (bg (face-attribute 'tool-bar :background))
         (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
                        (if (eq bg 'unspecified) nil (list :background bg))))
         (image (find-image
                (if (display-color-p)
!                   (list (list :type 'xpm :file (concat icon ".xpm"))
!                         (append (list :type 'pbm :file (concat icon ".pbm"))
!                                 colors)
!                         (append (list :type 'xbm :file (concat icon ".xbm"))
!                                 colors))
!                 (list (append (list :type 'pbm :file (concat icon ".pbm"))
!                               colors)
!                       (append (list :type 'xbm :file (concat icon ".xbm"))
!                               colors)
!                       (list :type 'xpm :file (concat icon ".xpm")))))))
      (when (and (display-images-p) image)
        (unless (image-mask-p image)
        (setq image (append image '(:mask heuristic))))
--- 118,134 ----
         (bg (face-attribute 'tool-bar :background))
         (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
                        (if (eq bg 'unspecified) nil (list :background bg))))
+        (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
+        (xpm-lo-spec (if (> (display-color-cells) 256)
+                         nil
+                       (list :type 'xpm :file (concat icon ".xpm"))))
+        (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
+        (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
         (image (find-image
                (if (display-color-p)
!                   (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
!                 (list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))))
! 
      (when (and (display-images-p) image)
        (unless (image-mask-p image)
        (setq image (append image '(:mask heuristic))))
***************
*** 170,186 ****
         (bg (face-attribute 'tool-bar :background))
         (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
                        (if (eq bg 'unspecified) nil (list :background bg))))
         (spec (if (display-color-p)
!                  (list (list :type 'xpm :file (concat icon ".xpm"))
!                        (append (list :type 'pbm :file (concat icon ".pbm"))
!                                      colors)
!                        (append (list :type 'xbm :file (concat icon ".xbm"))
!                                      colors))
!                (list (append (list :type 'pbm :file (concat icon ".pbm"))
!                                    colors)
!                      (append (list :type 'xbm :file (concat icon ".xbm"))
!                                    colors)
!                      (list :type 'xpm :file (concat icon ".xpm")))))
         (image (find-image spec))
         submap key)
      (when (and (display-images-p) image)
--- 169,183 ----
         (bg (face-attribute 'tool-bar :background))
         (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
                        (if (eq bg 'unspecified) nil (list :background bg))))
+        (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
+        (xpm-lo-spec (if (> (display-color-cells) 256)
+                         nil
+                       (list :type 'xpm :file (concat icon "-locol.xpm"))))
+        (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
+        (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
         (spec (if (display-color-p)
!                  (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
!                (list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))
         (image (find-image spec))
         submap key)
      (when (and (display-images-p) image)