changeset 102144:1ec88ff720f2

Daniel Jensen <daniel at bigwalter.net> (tiny change) (apropos-library): Check for null filename in load-history.
author Glenn Morris <rgm@gnu.org>
date Fri, 20 Feb 2009 06:06:18 +0000
parents c365db646335
children 16ac9218f780
files lisp/ChangeLog lisp/apropos.el
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Feb 20 06:03:45 2009 +0000
+++ b/lisp/ChangeLog	Fri Feb 20 06:06:18 2009 +0000
@@ -1,3 +1,7 @@
+2009-02-20  Daniel Jensen  <daniel@bigwalter.net>  (tiny change)
+
+	* apropos.el (apropos-library): Check for null filename in load-history.
+
 2009-02-20  Glenn Morris  <rgm@gnu.org>
 
 	* apropos.el (apropos-library): Remove the element with null filename,
--- a/lisp/apropos.el	Fri Feb 20 06:03:45 2009 +0000
+++ b/lisp/apropos.el	Fri Feb 20 06:06:18 2009 +0000
@@ -593,7 +593,7 @@
             (re (concat "\\(?:\\`\\|[\\/]\\)" (regexp-quote file)
                         "\\(\\.\\|\\'\\)")))
         (while (and lh (null lh-entry))
-          (if (string-match re (caar lh))
+          (if (and (caar lh) (string-match re (caar lh)))
               (setq lh-entry (car lh))
             (setq lh (cdr lh)))))
       (unless lh-entry (error "Unknown library `%s'" file)))