From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/62217 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.mail.mh-e.devel,gmane.emacs.gnus.general Subject: Re: *image-load-path-for-library update Date: Sat, 11 Mar 2006 18:00:09 -0800 Organization: Newt Software Message-ID: <17795.1142128809@olgas.newt.com> References: <20403.1141690692@olgas.newt.com> <13961.1142043152@olgas.newt.com> NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1142128877 32536 80.91.229.2 (12 Mar 2006 02:01:17 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 12 Mar 2006 02:01:17 +0000 (UTC) Original-X-From: mh-e-devel-admin@lists.sourceforge.net Sun Mar 12 03:01:09 2006 Return-path: Envelope-to: gmmd-mh-e-devel@m.gmane.org Original-Received: from lists-outbound.sourceforge.net ([66.35.250.225]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FIFtG-0003El-LK for gmmd-mh-e-devel@m.gmane.org; Sun, 12 Mar 2006 03:01:03 +0100 Original-Received: from sc8-sf-list1-b.sourceforge.net (sc8-sf-list1-b.sourceforge.net [10.3.1.7]) by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP id E2831120C8; Sat, 11 Mar 2006 18:01:01 -0800 (PST) Original-Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1FIFsU-0003tt-EZ for mh-e-devel@lists.sourceforge.net; Sat, 11 Mar 2006 18:00:14 -0800 Original-Received: from pop-borzoi.atl.sa.earthlink.net ([207.69.195.70]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1FIFsT-0006En-CF for mh-e-devel@lists.sourceforge.net; Sat, 11 Mar 2006 18:00:14 -0800 Original-Received: from h-68-165-5-58.snvacaid.dynamic.covad.net ([68.165.5.58] helo=olgas.newt.com) by pop-borzoi.atl.sa.earthlink.net with esmtp (Exim 3.36 #10) id 1FIFsR-0003xE-00; Sat, 11 Mar 2006 21:00:11 -0500 Original-Received: by olgas.newt.com (Postfix, from userid 1000) id 477D91707F; Sat, 11 Mar 2006 18:00:09 -0800 (PST) Original-Received: from olgas.newt.com (localhost [127.0.0.1]) by olgas.newt.com (Postfix) with ESMTP id C45EB1707E; Sat, 11 Mar 2006 18:00:09 -0800 (PST) Original-To: mh-e-devel@lists.sourceforge.net, ding@gnus.org In-reply-to: Comments: In-reply-to Reiner Steib message dated "Sat, 11 Mar 2006 12:33:01 +0100." X-Mailer: MH-E 7.93+cvs; nmh 1.1; GNU Emacs 22.0.50.14 X-Image-URL: http://www.newt.com/wohler/images/bill-diving.png Mail-Followup-To: mh-e-devel@lists.sourceforge.net, ding@gnus.org X-Spam-Score: 1.0 (+) X-Spam-Report: Spam Filtering performed by sourceforge.net. See http://spamassassin.org/tag/ for more details. Report problems to http://sf.net/tracker/?func=add&group_id=1&atid=200001 1.0 FORGED_RCVD_HELO Received: contains a forged HELO Original-Sender: mh-e-devel-admin@lists.sourceforge.net Errors-To: mh-e-devel-admin@lists.sourceforge.net X-BeenThere: mh-e-devel@lists.sourceforge.net X-Mailman-Version: 2.0.9-sf.net Precedence: bulk List-Unsubscribe: , List-Id: Forum for the MH-E developers List-Post: List-Help: List-Subscribe: , List-Archive: X-Original-Date: Sat, 11 Mar 2006 18:00:09 -0800 Xref: news.gmane.org gmane.mail.mh-e.devel:11953 gmane.emacs.gnus.general:62217 Archived-At: 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 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