From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: daniel@bigwalter.net (Daniel Jensen) Newsgroups: gmane.emacs.devel Subject: apropos-library: Check for null library in load-history Date: Wed, 11 Feb 2009 23:16:43 +0100 Message-ID: <87r624wrec.fsf@orme.bigwalter.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1234390819 4767 80.91.229.12 (11 Feb 2009 22:20:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 11 Feb 2009 22:20:19 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 11 23:21:34 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LXNSV-0008BF-9y for ged-emacs-devel@m.gmane.org; Wed, 11 Feb 2009 23:21:31 +0100 Original-Received: from localhost ([127.0.0.1]:50640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LXNRB-0001AL-Ew for ged-emacs-devel@m.gmane.org; Wed, 11 Feb 2009 17:20:09 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LXNR6-0001A8-PB for emacs-devel@gnu.org; Wed, 11 Feb 2009 17:20:04 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LXNR5-00019v-Ay for emacs-devel@gnu.org; Wed, 11 Feb 2009 17:20:03 -0500 Original-Received: from [199.232.76.173] (port=34177 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LXNR5-00019q-4X for emacs-devel@gnu.org; Wed, 11 Feb 2009 17:20:03 -0500 Original-Received: from main.gmane.org ([80.91.229.2]:52976 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LXNR4-0003it-Os for emacs-devel@gnu.org; Wed, 11 Feb 2009 17:20:03 -0500 Original-Received: from root by ciao.gmane.org with local (Exim 4.43) id 1LXNR4-0003OZ-Oe for emacs-devel@gnu.org; Wed, 11 Feb 2009 22:20:02 +0000 Original-Received: from 81-231-84-106-no39.tbcn.telia.com ([81.231.84.106]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 11 Feb 2009 22:20:02 +0000 Original-Received: from daniel by 81-231-84-106-no39.tbcn.telia.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 11 Feb 2009 22:20:02 +0000 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 23 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 81-231-84-106-no39.tbcn.telia.com X-Face: SNGmwsN&0DaHhS0!*%\@y"Wc^).,<; VsqY#}K/NJ:A Z6_>Md7x$Z9C1%BAu41M'12-8(f2{H*8OsnYv,K+y.szl1K>}{uC/>2?; k[KUiD=$}@z>odk|7Tk7i $A|{j7LhTt!:SdVp5Z, kKA247}--"-QLedxCbw|#&bh=R]Rd)kx{q+T'fG)9ayG`+\@g'3vx1Fd3bl -`3}Guvr!A"Z);"$|]CXW>YR5m"<[L Mail-Copies-To: never User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.90 (gnu/linux) Cancel-Lock: sha1:t2Ms1wbSLctSbVlihkO1K1tmEQE= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:108991 Archived-At: apropos-library does not handle a null library name in load-history correctly. This patch fixes the problem. --- emacs/lisp/apropos.el 2009-01-05 04:18:41.000000000 +0100 +++ emacs-mod/lisp/apropos.el 2009-02-11 22:58:19.000000000 +0100 @@ -573,11 +573,12 @@ (nconc (delq nil (mapcar (lambda (l) - (setq l (file-name-nondirectory l)) - (while - (not (equal (setq l (file-name-sans-extension l)) - l))) - l) + (when (stringp l) + (setq l (file-name-nondirectory l)) + (while + (not (equal (setq l (file-name-sans-extension l)) + l))) + l)) (mapcar 'car load-history))) (mapcar 'car load-history)))) (list (completing-read "Describe library: " libs nil t))))