From: Morgan Smith <Morgan.J.Smith@outlook.com>
To: 70632@debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith@outlook.com>,
Andrew Tropin <andrew@trop.in>,
Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>,
Liliana Marie Prikler <liliana.prikler@gmail.com>
Subject: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs.
Date: Sun, 28 Apr 2024 13:07:23 -0400 [thread overview]
Message-ID: <CH3PR84MB3424497FCBC7281536D266D0C5142@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM> (raw)
* gnu/packages/aux-files/emacs/comp-integrity.el (expect-help): Update with
new terms for function descriptions. Also return the description instead of
'nil' on failure to aid in debugging.
Change-Id: I63a3644c91dd7817a72ab11ae87ec4fc8fdb2c1b
---
Hello!
Trying to build the latest Emacs from source fails because they changed the
names of this stuff. I was able to successfully build the latest Emacs with this patch.
Thanks,
Morgan
gnu/packages/aux-files/emacs/comp-integrity.el | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el
index abe7e7c0c9..d969f58622 100644
--- a/gnu/packages/aux-files/emacs/comp-integrity.el
+++ b/gnu/packages/aux-files/emacs/comp-integrity.el
@@ -16,10 +16,16 @@
(let ((desc (substring-no-properties
(with-output-to-string
(help-fns-function-description-header ',fun)))))
- (cond ((string-search "native-compiled" desc) 'native)
- ((string-search "byte-compiled" desc) 'byte)
- ((string-search "built-in" desc) 'built-in)
- (t nil))))))))
+ (cond ((or (string-search "native-compiled" desc) ;; Emacs <= 29
+ (string-search "subr-native-elisp" desc)) ;; Emacs >= 30
+ 'native)
+ ((or (string-search "byte-compiled" desc) ;; Emacs <= 29
+ (string-search "compiled-function" desc)) ;; Emacs >= 30
+ 'byte)
+ ((or (string-search "built-in" desc) ;; Emacs <= 29
+ (string-search "primitive-function" desc)) ;; Emacs >= 30
+ 'built-in)
+ (t desc))))))))
(defmacro expect-native (fun &optional feature)
`(progn (expect-help ,fun native ,feature)))
base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d
--
2.41.0
next reply other threads:[~2024-04-28 17:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-28 17:07 Morgan Smith [this message]
2024-04-28 17:40 ` [bug#70632] [PATCH v2] aux-files: comp-integrity: Adjust for newer emacs Morgan Smith
2024-04-29 18:44 ` [bug#70632] [PATCH 1/2] " Liliana Marie Prikler
2024-04-29 20:43 ` Morgan Smith
2024-04-29 21:38 ` Liliana Marie Prikler
2024-05-01 16:32 ` Morgan Smith
2024-05-01 16:46 ` Liliana Marie Prikler
2024-05-01 20:06 ` Morgan Smith
2024-05-02 4:24 ` Liliana Marie Prikler
2024-05-08 18:48 ` Morgan Smith
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=CH3PR84MB3424497FCBC7281536D266D0C5142@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM \
--to=morgan.j.smith@outlook.com \
--cc=70632@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=cox.katherine.e+guix@gmail.com \
--cc=liliana.prikler@gmail.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/guix.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.