Mercurial > emacs
changeset 69493:4f9233243d97
(image-load-path-for-library): Fix example by not recommending that
one binds image-load-path. Just defvar it to placate compiler and only
use it if previously defined.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Wed, 15 Mar 2006 17:06:16 +0000 |
| parents | 6afc0d1f682b |
| children | a996c2fa0b6a |
| files | lisp/ChangeLog lisp/image.el |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Mar 15 17:03:58 2006 +0000 +++ b/lisp/ChangeLog Wed Mar 15 17:06:16 2006 +0000 @@ -1,3 +1,9 @@ +2006-03-15 Bill Wohler <wohler@newt.com> + + * image.el (image-load-path-for-library): Fix example by not + recommending that one binds image-load-path. Just defvar it to + placate compiler and only use it if previously defined. + 2006-03-15 Carsten Dominik <dominik@science.uva.nl> * textmodes/org.el (org-insert-centered): Use `string-width' to
--- a/lisp/image.el Wed Mar 15 17:03:58 2006 +0000 +++ b/lisp/image.el Wed Mar 15 17:06:16 2006 +0000 @@ -99,11 +99,13 @@ compatibility with versions of Emacs that lack the variable `image-load-path': - ;; Avoid errors on Emacsen without `image-load-path'. - (if (not (boundp 'image-load-path)) (defvar image-load-path nil)) + ;; Shush compiler. + (defvar 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))) + (image-load-path (cons (car load-path) + (when (boundp 'image-load-path) + image-load-path)))) (mh-tool-bar-folder-buttons-init))" (unless library (error "No library specified")) (unless image (error "No image specified"))