* lisp/emacs-lisp/comp-cstr.el (comp-cstr-symbol-p): Simplify.

(cherry picked from commit d4d8575bf00bb722bbb913fa5aa5b68c6dbef4d3)

diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
index 65240550f6b03850e69c03bb16d288a6322333d3..d7d3b12e148527d401ac1144ced328b7d6b33501 100644 (file)
--- 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."