From: Glenn Morris <rgm@gnu.org>
Date: Fri, 20 Feb 2009 06:06:18 +0000 (+0000)
Subject: Daniel Jensen  <daniel at bigwalter.net>  (tiny change)
X-Git-Tag: emacs-pretest-23.0.91~117
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7aad296acfd3f744f3689905b358bbe160a2d0f0;p=emacs.git

Daniel Jensen  <daniel at bigwalter.net>  (tiny change)

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a2e46c9191..fbcec5b8f5e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/apropos.el b/lisp/apropos.el
index 91e763185b6..375b19eebe7 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -593,7 +593,7 @@ thus be found in `load-history'."
             (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)))