From ca1ac5c4b1e03420dbda3c29db2db1791bb7f539 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Wed, 10 Apr 2024 18:03:26 +0200 Subject: [PATCH] * lisp/emacs-lisp/comp-cstr.el (comp-cstr-symbol-p): Simplify. (cherry picked from commit d4d8575bf00bb722bbb913fa5aa5b68c6dbef4d3) --- lisp/emacs-lisp/comp-cstr.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index 65240550f6b..d7d3b12e148 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -928,11 +928,9 @@ Non memoized version of `comp-cstr-intersection-no-mem'." (with-comp-cstr-accessors (and (null (range cstr)) (null (neg cstr)) - (or (and (null (valset cstr)) + (and (or (null (typeset cstr)) (equal (typeset cstr) '(symbol))) - (and (or (null (typeset cstr)) - (equal (typeset cstr) '(symbol))) - (cl-every #'symbolp (valset cstr))))))) + (cl-every #'symbolp (valset cstr)))))) (defsubst comp-cstr-cons-p (cstr) "Return t if CSTR is certainly a cons." -- 2.39.5