diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-01-24 21:05:33 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-01-24 21:05:33 +0100 |
| commit | b8d3ae78c54db7c7bb65d367a80f9be3d8744c48 (patch) | |
| tree | 982f190d1dd79685c43a9829dd66e6a7cbbd0c67 /lisp/emacs-lisp/ert.el | |
| parent | 0ffb3dfaa483b0c5cf1f7f367efcb5e9c041ab53 (diff) | |
| parent | e5aaa1251cfb9d6d18682a5eda137a2e12ca4213 (diff) | |
| download | emacs-b8d3ae78c54db7c7bb65d367a80f9be3d8744c48.tar.gz emacs-b8d3ae78c54db7c7bb65d367a80f9be3d8744c48.tar.bz2 emacs-b8d3ae78c54db7c7bb65d367a80f9be3d8744c48.zip | |
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'lisp/emacs-lisp/ert.el')
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 58517549454..fdbf95319ff 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -487,7 +487,7 @@ Errors during evaluation are caught and handled like nil." Returns nil if they are." (if (not (eq (type-of a) (type-of b))) `(different-types ,a ,b) - (pcase-exhaustive a + (pcase a ((pred consp) (let ((a-length (proper-list-p a)) (b-length (proper-list-p b))) @@ -538,7 +538,7 @@ Returns nil if they are." for xi = (ert--explain-equal-rec ai bi) do (when xi (cl-return `(array-elt ,i ,xi))) finally (cl-assert (equal a b) t)))) - ((pred atom) + (_ (if (not (equal a b)) (if (and (symbolp a) (symbolp b) (string= a b)) `(different-symbols-with-the-same-name ,a ,b) |