# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1235109978 0
# Node ID 1ec88ff720f2e43bfcf96087ab81ea031e4eb2d6
# Parent  c365db646335c9693a611e2b69b39dae32f3c06c
Daniel Jensen  <daniel at bigwalter.net>  (tiny change)

(apropos-library): Check for null filename in load-history.

diff -r c365db646335 -r 1ec88ff720f2 lisp/ChangeLog
--- 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,
diff -r c365db646335 -r 1ec88ff720f2 lisp/apropos.el
--- 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)))