[bug#70632,v2] aux-files: comp-integrity: Adjust for newer emacs.
Commit Message
* 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
---
I apologize. Two hours before I sent the original patch they changed the
descriptions once again. This patch is the same as before except instead of
"compiled-function" we now have "byte-code-function".
gnu/packages/aux-files/emacs/comp-integrity.el | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d
@@ -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)))