From: Glenn Morris <rgm@gnu.org>
Date: Wed, 1 Mar 2017 19:35:29 +0000 (-0500)
Subject: Small help--loaded-p fix
X-Git-Tag: emacs-26.0.90~680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebb105054a421faff17ee11f0cbcbed87661dd11;p=emacs.git

Small help--loaded-p fix

* lisp/help-fns.el (help--loaded-p): Handle entry in load-history
with nil file name.  (Bug#25847)
---

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 742c66919af..21f76e100a7 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -73,7 +73,7 @@ The functions will receive the function name as argument.")
       (let* ((re (load-history-regexp file))
              (done nil))
         (dolist (x load-history)
-          (if (string-match-p re (car x)) (setq done t)))
+          (and (car x) (string-match-p re (car x)) (setq done t)))
         done)))
 
 (defun help--load-prefixes (prefixes)