(turn-on-iimage-mode, iimage-mode): Add autoload cookies.

(iimage-mode-image-search-path): New user option to search the
image file.
(iimage-locate-file): New funcion.  Emacs21.3 or earlier does not
have locate-file.
(iimage-mode-buffer): Use it.

2 files changed, 29 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6ab8ca604c..19ecb15cf2d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-03  KOSEKI Yoshinori  <kose@meadowy.org>
+
+        * iimage.el (turn-on-iimage-mode, iimage-mode): Add autoload
+        cookies.
+        (iimage-mode-image-search-path): New user option to search the
+        image file.
+        (iimage-locate-file): New funcion.  Emacs21.3 or earlier does not
+        have locate-file.
+        (iimage-mode-buffer): Use it.
+
 2004-07-03  Nick Roberts  <nickrob@gnu.org>
 
         * progmodes/gdb-ui.el (gdb-goto-breakpoint): String match more
diff --git a/lisp/iimage.el b/lisp/iimage.el
index d138498ca3a..9b183ebb01d 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -25,12 +25,13 @@
 
 ;;; Commentary:
 
-;; Iimage is a minor mode that display a images, when image-filename
-;; exists in buffer.
+;; Iimage is a minor mode that displays images, when image-filename
+;; exists in the buffer.
 ;; http://www.netlaputa.ne.jp/~kose/Emacs/iimage.html
 ;;
 ;; Add to your `~/.emacs':
-;; (autoload 'iimage-mode "iimage" "SUpport Inline image minor mode." t)
+;; (autoload 'iimage-mode "iimage" "Support Inline image minor mode." t)
+;; (autoload 'turn-on-iimage-mode "iimage" "Turn on Inline image minor mode." t)
 ;;
 ;; ** Display images in *Info* buffer.
 ;;
@@ -50,7 +51,7 @@
 (eval-when-compile
   (require 'image-file))
 
-(defconst iimage-version "1.0")
+(defconst iimage-version "1.1")
 (defvar iimage-mode nil)
 (defvar iimage-mode-map nil)
 
@@ -89,6 +90,10 @@ image filename regex exsamples:
      foo.JPG
 ")
 
+(defvar iimage-mode-image-search-path nil
+"*List of directories to search for image files for iimage-mode.")
+
+;;;###autoload
 (defun turn-on-iimage-mode ()
 "Unconditionally turn on iimage mode."
   (interactive)
@@ -99,6 +104,12 @@ image filename regex exsamples:
   (interactive)
   (iimage-mode 0))
 
+;; Emacs21.3 or earlier does not heve locate-file.
+(if (fboundp 'locate-file)
+    (defalias 'iimage-locate-file 'locate-file)
+  (defun iimage-locate-file (filename path)
+    (locate-library filename t path)))
+
 (defun iimage-mode-buffer (arg)
 "Display/Undisplay Images.
 With numeric ARG, display the images if and only if ARG is positive."
@@ -113,8 +124,9 @@ With numeric ARG, display the images if and only if ARG is positive."
       (dolist (pair iimage-mode-image-regex-alist)
         (while (re-search-forward (car pair) nil t)
           (if (and (setq file (match-string (cdr pair)))
-                   (setq file (expand-file-name file default-directory))
-                   (file-exists-p file))
+                   (setq file (iimage-locate-file file
+                                   (cons default-directory
+                                         iimage-mode-image-search-path))))
               (if ing
                   (add-text-properties (match-beginning 0) (match-end 0)
                                        (list 'display (create-image file)))
@@ -122,6 +134,7 @@ With numeric ARG, display the images if and only if ARG is positive."
                                         '(display)))))))
     (set-buffer-modified-p modp)))
 
+;;;###autoload
 (define-minor-mode iimage-mode
   "Toggle inline image minor mode."
   nil " iImg" iimage-mode-map