Re: *image-load-path-for-library update

[Bill Wohler <wohler@newt.com>]

Before I check this in, any comments?

Index: image.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/image.el,v
retrieving revision 1.57
diff -u -u -r1.57 image.el
--- image.el	11 Mar 2006 02:04:08 -0000	1.57
+++ image.el	12 Mar 2006 01:58:14 -0000
@@ -85,21 +86,20 @@
 well as in `image-load-path' and `load-path'.
 
 This function returns the value of `load-path' augmented with the
-directory containing IMAGE. If PATH is given, it is used instead
-of `load-path'. If PATH is t, just return the directory that
-contains IMAGE.
-
-If NO-ERROR is non-nil, return nil if a suitable path can't be
-found rather than signaling an error.
+directory containing IMAGE at the beginning of the list. If PATH
+is given, it is used instead of `load-path'. If PATH is t, just
+return the directory that contains IMAGE.
+
+If NO-ERROR is non-nil and a suitable path can't be found, don't
+signal an error. Instead, return nil if PATH is t or an augmented
+path with nil at the beginning of the list.
 
 Here is an example that uses a common idiom to provide
 compatibility with versions of Emacs that lack the variable
 `image-load-path':
 
-  (let ((load-path
-         (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\"))
-        (image-load-path
-         (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\" 'image-load-path)))
+  (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\"))
+         (image-load-path (cons (car load-path) image-load-path)))
     (mh-tool-bar-folder-buttons-init))"
   (unless library (error "No library specified"))
   (unless image   (error "No image specified"))
@@ -142,16 +142,14 @@
                        dir (expand-file-name "../" dir)))
                (setq image-directory dir)))))
      (no-error
-      ;; In this case we will return nil.
       (message "Could not find image %s for library %s" image library))
      (t
       (error "Could not find image %s for library %s" image library)))
 
-    ;; Return the directory, nil if no-error was non-nil and a
-    ;; suitable path could not be found, or an augmented
+    ;; Return the directory (or nil if no-error was non-nil and a
+    ;; suitable path could not be found), or an augmented
     ;; `image-load-path' or `load-path'.
-    (cond ((or (null image-directory)
-               (eq path t))
+    (cond ((eq path t)
            image-directory)
           ((and path (symbolp path))
            (nconc (list image-directory)

-- 
Bill Wohler <wohler@newt.com>  http://www.newt.com/wohler/  GnuPG ID:610BD9AD
Maintainer of comp.mail.mh FAQ and MH-E. Vote Libertarian!
If you're passed on the right, you're in the wrong lane.


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642