From: Philip Kaludercic <philipk@posteo.net>
To: Spencer Baugh <sbaugh@janestreet.com>
Cc: sbaugh@catern.com, 'Eli Zaretskii' <eliz@gnu.org>, 64543@debbugs.gnu.org
Subject: bug#64543: [PATCH] package-report-bug: don't fail on custom groups defined by eval
Date: Fri, 14 Jul 2023 19:44:15 +0000 [thread overview]
Message-ID: <87fs5qp9bk.fsf@posteo.net> (raw)
In-Reply-To: <ierjzv4j43n.fsf@janestreet.com> (Spencer Baugh's message of "Wed, 12 Jul 2023 15:56:44 -0400")
Spencer Baugh <sbaugh@janestreet.com> writes:
> Philip Kaludercic <philipk@posteo.net> writes:
>
>> sbaugh@catern.com writes:
>>> Good point. I was just copying the last condition in the and. Lifted
>>> them both out of the loop:
>>>
>>> From 2873d4c482acfd1ced749d593fd512c408e0a578 Mon Sep 17 00:00:00 2001
>>> From: Spencer Baugh <sbaugh@catern.com>
>>> Date: Sun, 9 Jul 2023 22:21:03 -0400
>>> Subject: [PATCH] Support transforming the dirname used by uniquify
>>
>> Wrong patch?
> Oops! Here's the right one:
>
> From fb31777bcc1935de351eaa35c1ed679c66d24a92 Mon Sep 17 00:00:00 2001
> From: Spencer Baugh <sbaugh@catern.com>
> Date: Sun, 9 Jul 2023 12:59:50 -0400
> Subject: [PATCH] package-report-bug: don't fail on custom groups defined by
> eval
>
> Previously we just assumed that the car of an element of
> custom-current-group-alist was a filename. But actually it can be nil
> if a custom group was defined by just evaling Lisp.
>
> * lisp/emacs-lisp/package.el (package-report-bug): Don't fail when a
> custom group was defined by eval.
> ---
> 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 @@ package-report-bug
> 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))))
LGTM.
Eli, would it be OK to push this to emacs-29, as this is a bug in the
existing code? Most of the changes are indentation/whitespace changes
anyway.
next prev parent reply other threads:[~2023-07-14 19:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-09 17:08 bug#64543: [PATCH] package-report-bug: don't fail on custom groups defined by eval sbaugh
2023-07-10 14:13 ` Philip Kaludercic
2023-07-12 19:26 ` sbaugh
2023-07-12 19:48 ` Philip Kaludercic
2023-07-12 19:56 ` Spencer Baugh
2023-07-14 19:44 ` Philip Kaludercic [this message]
2023-07-15 5:49 ` Eli Zaretskii
2023-07-15 7:40 ` Philip Kaludercic
2023-07-15 8:57 ` Eli Zaretskii
2023-07-13 4:54 ` Eli Zaretskii
[not found] <c6bc281e-d6e5-4c5c-8315-157c6b089330@email.android.com>
2023-07-15 9:23 ` Eli Zaretskii
2023-07-15 10:05 ` Philip Kaludercic
2023-07-15 10:23 ` Eli Zaretskii
2023-07-15 23:33 ` Philip Kaludercic
2023-07-15 17:45 ` sbaugh
2023-07-16 12:33 ` Philip Kaludercic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fs5qp9bk.fsf@posteo.net \
--to=philipk@posteo.net \
--cc=64543@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=sbaugh@catern.com \
--cc=sbaugh@janestreet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.