aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/ert.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 68762b0752c..47d20cb69e8 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -516,6 +516,11 @@ Returns nil if they are."
516 (cl-assert (equal a b) t) 516 (cl-assert (equal a b) t)
517 nil)))))))) 517 nil))))))))
518 ((pred arrayp) 518 ((pred arrayp)
519 ;; For mixed unibyte/multibyte string comparisons, make both multibyte.
520 (when (and (stringp a)
521 (xor (multibyte-string-p a) (multibyte-string-p b)))
522 (setq a (string-to-multibyte a))
523 (setq b (string-to-multibyte b)))
519 (if (/= (length a) (length b)) 524 (if (/= (length a) (length b))
520 `(arrays-of-different-length ,(length a) ,(length b) 525 `(arrays-of-different-length ,(length a) ,(length b)
521 ,a ,b 526 ,a ,b