Commit 08f99a54 authored by Bill Wohler's avatar Bill Wohler

(mh-image-load-path-for-library): Merged changes from Reiner. Add

no-error argument. If path t, just return directory.
parent 4a732ae9
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
flag to replace-in-string. This was badly needed by flag to replace-in-string. This was badly needed by
mh-quote-pick-expr in order to properly quote subjects when using mh-quote-pick-expr in order to properly quote subjects when using
/ s on XEmacs (closes SF #1447598). / s on XEmacs (closes SF #1447598).
(mh-image-load-path-for-library): Merged changes from Reiner. Add
no-error argument. If path t, just return directory.
* mh-e.el (mh-profile-component): Drop `s' from mhparam * mh-e.el (mh-profile-component): Drop `s' from mhparam
-components for Mailutils compatibility (closes SF #1446985). -components for Mailutils compatibility (closes SF #1446985).
......
...@@ -116,7 +116,7 @@ introduced in Emacs 22." ...@@ -116,7 +116,7 @@ introduced in Emacs 22."
`(face-background ,face ,frame ,inherit))) `(face-background ,face ,frame ,inherit)))
(mh-defun-compat mh-image-load-path-for-library (mh-defun-compat mh-image-load-path-for-library
image-load-path-for-library (library image &optional path) image-load-path-for-library (library image &optional path no-error)
"Return a suitable search path for images relative to LIBRARY. "Return a suitable search path for images relative to LIBRARY.
Images for LIBRARY are searched for in \"../../etc/images\" and Images for LIBRARY are searched for in \"../../etc/images\" and
...@@ -124,8 +124,12 @@ Images for LIBRARY are searched for in \"../../etc/images\" and ...@@ -124,8 +124,12 @@ Images for LIBRARY are searched for in \"../../etc/images\" and
well as in `image-load-path' and `load-path'. well as in `image-load-path' and `load-path'.
This function returns the value of `load-path' augmented with the This function returns the value of `load-path' augmented with the
path to IMAGE. If PATH is given, it is used instead of directory containing IMAGE. If PATH is given, it is used instead
`load-path'. 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.
Here is an example that uses a common idiom to provide Here is an example that uses a common idiom to provide
compatibility with versions of Emacs that lack the variable compatibility with versions of Emacs that lack the variable
...@@ -179,11 +183,19 @@ This function is used by Emacs versions that don't have ...@@ -179,11 +183,19 @@ This function is used by Emacs versions that don't have
(setq img (directory-file-name parent) (setq img (directory-file-name parent)
dir (expand-file-name "../" dir))) dir (expand-file-name "../" dir)))
(setq image-directory 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 (t
(error "Could not find image %s for library %s" image library))) (error "Could not find image %s for library %s" image library)))
;; Return augmented `image-load-path' or `load-path'. ;; Return the directory, nil if no-error was non-nil and a
(cond ((and path (symbolp path)) ;; suitable path could not be found, or an augmented
;; `image-load-path' or `load-path'.
(cond ((or (null image-directory)
(eq path t))
image-directory)
((and path (symbolp path))
(nconc (list image-directory) (nconc (list image-directory)
(delete image-directory (delete image-directory
(if (boundp path) (if (boundp path)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment