summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-12-31 15:32:51 +0100
committerAndrea Corallo <akrl@sdf.org>2021-01-01 12:29:50 +0100
commite9f5fadb0ecb64148472f846a99a0d7e95daeaee (patch)
tree766f7b10b13f1880bde48de2df2811ba1bc3893e /lisp/emacs-lisp
parentf78580a0f5b913c60862d2ddedfc6b80e5cb4791 (diff)
downloademacs-e9f5fadb0ecb64148472f846a99a0d7e95daeaee.tar.gz
emacs-e9f5fadb0ecb64148472f846a99a0d7e95daeaee.tar.bz2
emacs-e9f5fadb0ecb64148472f846a99a0d7e95daeaee.zip
* 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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/comp-cstr.el12
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
index c03056e3afe..a53372be006 100644
--- 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.