diff options
| author | Morgan Smith <Morgan.J.Smith@outlook.com> | 2024-04-28 13:40:51 -0400 |
|---|---|---|
| committer | Guix Patches Tester <> | 2024-04-28 20:51:12 +0200 |
| commit | 39b708ffaf79e972673659a8f9d407a6e742a981 (patch) | |
| tree | 68ad363eac2553279738c1e31d56e7c1e11c01cf | |
| parent | 4178eaf3b2eeea8f6c2e49b1d65cd60a1663c4a9 (diff) | |
| download | guix-patches-issue-70632.tar guix-patches-issue-70632.tar.gz | |
aux-files: comp-integrity: Adjust for newer emacs.issue-70632
* 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
| -rw-r--r-- | gnu/packages/aux-files/emacs/comp-integrity.el | 14 |
1 files 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..0c11100d22 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 "byte-code-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))) |