diff options
| author | Glenn Morris | 2013-02-03 23:46:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-02-03 23:46:22 -0800 |
| commit | 84a06b500fd1cb500e89b93d3f5746b60c6ffdd4 (patch) | |
| tree | c888ad2efeb411dd7ce1a3108fa349eaf15a01c8 | |
| parent | 69d52b98fc53446450319ae96881dd57683e0349 (diff) | |
| download | emacs-84a06b500fd1cb500e89b93d3f5746b60c6ffdd4.tar.gz emacs-84a06b500fd1cb500e89b93d3f5746b60c6ffdd4.zip | |
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
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b676835bfef..b43b7bc61d1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-02-04 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/ert.el (ert--explain-format-atom): | ||
| 4 | Don't try to print non-characters as characters. (Bug#13543) | ||
| 5 | |||
| 1 | 2013-02-03 Michael Albinus <michael.albinus@gmx.de> | 6 | 2013-02-03 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * net/tramp.el (tramp-debug-message): Extend function exclude list. | 8 | * 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 dd849362228..7df3acccbc9 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el | |||
| @@ -568,7 +568,8 @@ failed." | |||
| 568 | (defun ert--explain-format-atom (x) | 568 | (defun ert--explain-format-atom (x) |
| 569 | "Format the atom X for `ert--explain-equal'." | 569 | "Format the atom X for `ert--explain-equal'." |
| 570 | (cl-typecase x | 570 | (cl-typecase x |
| 571 | (fixnum (list x (format "#x%x" x) (format "?%c" x))) | 571 | (character (list x (format "#x%x" x) (format "?%c" x))) |
| 572 | (fixnum (list x (format "#x%x" x))) | ||
| 572 | (t x))) | 573 | (t x))) |
| 573 | 574 | ||
| 574 | (defun ert--explain-equal-rec (a b) | 575 | (defun ert--explain-equal-rec (a b) |