emacs-29 17073af84d7: ; Improve robustness of package-report-bug

[Philip Kaludercic]

branch: emacs-29
commit 17073af84d7eaedc81d84fc16f8aa0db215c6a31
Author: Spencer Baugh <sbaugh@catern.com>
Commit: Philip Kaludercic <philipk@posteo.net>

    ; Improve robustness of package-report-bug
    
    * lisp/emacs-lisp/package.el (package-report-bug): Do not assume that
    every entry in 'custom-current-group-alist' has a non-nil entry for a
    filename.
    
    It is possible for a group to not be associated with any file, e.g. when
    a 'defgroup' form is evaluated using 'eval-expression'.  (bug#64543)
---
 lisp/emacs-lisp/package.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 3e6acd9b388..58ca19f7fe2 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4637,13 +4637,14 @@ DESC must be a `package-desc' object."
         vars)
     (dolist-with-progress-reporter (group custom-current-group-alist)
         "Scanning for modified user options..."
-      (dolist (ent (get (cdr group) 'custom-group))
-        (when (and (custom-variable-p (car ent))
-                   (boundp (car ent))
-                   (not (eq (custom--standard-value (car ent))
-                            (default-toplevel-value (car ent))))
-                   (file-in-directory-p (car group) (package-desc-dir desc)))
-          (push (car ent) vars))))
+      (when (and (car group)
+                 (file-in-directory-p (car group) (package-desc-dir desc)))
+        (dolist (ent (get (cdr group) 'custom-group))
+          (when (and (custom-variable-p (car ent))
+                     (boundp (car ent))
+                     (not (eq (custom--standard-value (car ent))
+                              (default-toplevel-value (car ent)))))
+            (push (car ent) vars)))))
     (dlet ((reporter-prompt-for-summary-p t))
       (reporter-submit-bug-report maint name vars))))