ert--explain-format-atom fix for non-characters

* lisp/emacs-lisp/ert.el (ert--explain-format-atom):
Don't try to print non-characters as characters.

Fixes: debbugs:13543

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b676835bfef0ae3e8a4d799262fe4f837bd97634..b43b7bc61d1cc5ada8cdad53763eb623671a032c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-04  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/ert.el (ert--explain-format-atom):
+       Don't try to print non-characters as characters.  (Bug#13543)
+
 2013-02-03  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-debug-message): Extend function exclude list.

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index dd8493622289952be819b95bb5c25a0f2ef5ddb3..7df3acccbc98fd6d1cac62763787bf36566e321d 100644 (file)
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -568,7 +568,8 @@ failed."
 (defun ert--explain-format-atom (x)
   "Format the atom X for `ert--explain-equal'."
   (cl-typecase x
-    (fixnum (list x (format "#x%x" x) (format "?%c" x)))
+    (character (list x (format "#x%x" x) (format "?%c" x)))
+    (fixnum (list x (format "#x%x" x)))
     (t x)))
 
 (defun ert--explain-equal-rec (a b)