[AUCTeX-devel] toolbarx-find-image didn't work with current CVS Emacs

[Reiner Steib]

Hi,

when using a current CVS Emacs, the standard tool bar icons disappear
when using `LaTeX-install-toolbar'.  This is due to the recent changes
(lisp/toolbar/*.xpm -> etc/images/), see etc/ChangeLog.

I've changed `toolbarx-find-image' to first search the image using
`image-search-load-path' and `image-load-path' (if available) and then
use `locate-library':

--8<---------------cut here---------------start------------->8---
--- toolbar-x.el        05 May 2005 19:19:44 +0200      1.7
+++ toolbar-x.el        20 Oct 2005 14:56:46 +0200      
@@ -1109,7 +1109,13 @@
   (let ((file))
     (dolist (i '("" ".xpm" ".xbm" ".pbm"))
       (unless file
-       (setq file (locate-library (concat filename i) t toolbarx-image-path))))
+       (setq file
+             (or
+              (and (fboundp 'image-search-load-path) ;; Emacs 22+
+                   (boundp 'image-load-path)
+                   (image-search-load-path
+                    (concat filename i) image-load-path))
+              (locate-library (concat filename i) t toolbarx-image-path)))))
     (when file
       (funcall (if (featurep 'xemacs) 'make-glyph 'create-image)
               file))))
--8<---------------cut here---------------end--------------->8---

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/