* Fix two predicates for missing negation handling

	* lisp/emacs-lisp/comp-cstr.el (comp-cstr-empty-p)
	(comp-cstr-null-p): Fix missing negation handling.

diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
index c03056e3afeab3aa03afdd0ee7bf55259d874bba..a53372be0060af20963e257feca311f608eaba1e 100644 (file)
--- a/lisp/emacs-lisp/comp-cstr.el
+++ b/lisp/emacs-lisp/comp-cstr.el
@@ -139,14 +139,16 @@ Integer values are handled in the `range' slot.")
   (with-comp-cstr-accessors
     (and (null (typeset cstr))
          (null (valset cstr))
-         (null (range cstr)))))
+         (null (range cstr))
+         (null (neg cstr)))))
 
-(defsubst comp-cstr-null-p (x)
+(defsubst comp-cstr-null-p (cstr)
   "Return t if CSTR is equivalent to the `null' type specifier, nil otherwise."
   (with-comp-cstr-accessors
-    (and (null (typeset x))
-         (null (range x))
-         (equal (valset x) '(nil)))))
+    (and (null (typeset cstr))
+         (null (range cstr))
+         (null (neg cstr))
+         (equal (valset cstr) '(nil)))))
 
 (defun comp-cstrs-homogeneous (cstrs)
   "Check if constraints CSTRS are all homogeneously negated or non-negated.