From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 10 Jun 2023 17:48:21 +0000 (+0300)
Subject: Avoid errors in 'apropos-documentation' after 'eval-buffer'
X-Git-Tag: emacs-29.0.92~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c623e4feb9e141715a4959655f894c335ca3668;p=emacs.git

Avoid errors in 'apropos-documentation' after 'eval-buffer'

* lisp/apropos.el (apropos--map-preloaded-atoms): Support the case
where an element of 'load-history' has nil as its car.  (Bug#63881)
---

diff --git a/lisp/apropos.el b/lisp/apropos.el
index 5d7fe6962a5..c9551b06529 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -900,7 +900,8 @@ Optional arg BUFFER (default: current buffer) is the buffer to check."
     ;; state of the `obarray' when we dumped, which we may also be able to
     ;; use in `bytecomp' to provide a clean initial environment?)
     (dolist (x load-history)
-      (when (string-match preloaded-regexp (car x))
+      (when (let ((elt (car x)))
+              (and (stringp elt) (string-match preloaded-regexp elt)))
         (dolist (def (cdr x))
           (cond
            ((symbolp def) (funcall f def))