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

[Luc Teirlinck]

Index: emacs/lisp/toolbar/tool-bar.el
diff -c emacs/lisp/toolbar/tool-bar.el:1.36 emacs/lisp/toolbar/tool-bar.el:1.37
*** emacs/lisp/toolbar/tool-bar.el:1.36 Tue Jun  8 17:53:11 2004
--- emacs/lisp/toolbar/tool-bar.el      Wed Jun  9 21:56:20 2004
***************
*** 96,102 ****
  Info node `(elisp)Tool Bar'.  Items are added from left to right.
  
  ICON is the base name of a file containing the image to use.  The
! function will first try to use ICON-locol.xpm if display-color-cells
  is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
  ICON.xbm, using `find-image'.
  
--- 96,102 ----
  Info node `(elisp)Tool Bar'.  Items are added from left to right.
  
  ICON is the base name of a file containing the image to use.  The
! function will first try to use lc-ICON.xpm if display-color-cells
  is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
  ICON.xbm, using `find-image'.
  
***************
*** 113,119 ****
  Info node `(elisp)Tool Bar'.  Items are added from left to right.
  
  ICON is the base name of a file containing the image to use.  The
! function will first try to use ICON-locol.xpm if display-color-cells
  is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
  ICON.xbm, using `find-image'."
    (let* ((fg (face-attribute 'tool-bar :foreground))
--- 113,119 ----
  Info node `(elisp)Tool Bar'.  Items are added from left to right.
  
  ICON is the base name of a file containing the image to use.  The
! function will first try to use lc-ICON.xpm if display-color-cells
  is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
  ICON.xbm, using `find-image'."
    (let* ((fg (face-attribute 'tool-bar :foreground))
***************
*** 123,129 ****
         (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
--- 123,129 ----
         (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
         (xpm-lo-spec (if (> (display-color-cells) 256)
                          nil
!                       (list :type 'xpm :file (concat "lc-" 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
***************
*** 174,180 ****
         (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)
--- 174,180 ----
         (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
         (xpm-lo-spec (if (> (display-color-cells) 256)
                          nil
!                       (list :type 'xpm :file (concat "lc-" icon ".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)