emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 2c623e4feb9: Avoid errors in 'apropos-documentation' after 'eva


From: Eli Zaretskii
Subject: emacs-29 2c623e4feb9: Avoid errors in 'apropos-documentation' after 'eval-buffer'
Date: Sat, 10 Jun 2023 13:49:00 -0400 (EDT)

branch: emacs-29
commit 2c623e4feb9e141715a4959655f894c335ca3668
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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)
---
 lisp/apropos.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]