Commit 7f228379 authored by Gerd Moellmann's avatar Gerd Moellmann

(defimage): Look for image files in load-path.

parent 70d9b8fd
;;; image.el --- image API
;; Copyright (C) 1998, 1999 Free Software Foundation, Inc.
;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
;; Keywords: multimedia
;; This file is part of GNU Emacs.
......@@ -200,12 +200,19 @@ Example:
(let* ((spec (car specs))
(type (plist-get spec :type))
(data (plist-get spec :data))
(file (plist-get spec :file)))
(file (plist-get spec :file))
(when (image-type-available-p type)
(cond ((stringp file)
(setq file (expand-file-name file data-directory))
(when (file-readable-p file)
(setq image (cons 'image (plist-put spec :file file)))))
(let ((path load-path))
(while (and (not found) path)
(let ((try-file (expand-file-name file (car path))))
(when (file-readable-p try-file)
(setq found try-file)))
(setq path (cdr path)))
(unless found
(setq found (expand-file-name file data-directory)))
(setq image (cons 'image (plist-put spec :file found)))))
((not (null data))
(setq image (cons 'image spec)))))
(setq specs (cdr specs))))
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