[AUCTeX-diffs] Changes to auctex/toolbar-x.el

[Reiner Steib]

Index: auctex/toolbar-x.el
diff -u auctex/toolbar-x.el:1.7 auctex/toolbar-x.el:1.8
--- auctex/toolbar-x.el:1.7     Mon May  2 14:37:44 2005
+++ auctex/toolbar-x.el Thu Oct 20 12:57:52 2005
@@ -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))))