diff options
| author | Anders Lindgren <andlind@gmail.com> | 2015-10-28 12:09:51 +0100 |
|---|---|---|
| committer | Anders Lindgren <andlind@gmail.com> | 2015-10-28 12:09:51 +0100 |
| commit | cc587a3539612d250d222363b18d15258e33f82a (patch) | |
| tree | 00c74927ef3da99c7226cbaf586d439e0236b85c /lisp/emacs-lisp/ert.el | |
| parent | 590449f3d87f8f43eb0a852233e8945ecbe1c6aa (diff) | |
| parent | 64c2bfbc4f5daba2ee55acb58a2929070a846b6e (diff) | |
| download | emacs-cc587a3539612d250d222363b18d15258e33f82a.tar.gz emacs-cc587a3539612d250d222363b18d15258e33f82a.tar.bz2 emacs-cc587a3539612d250d222363b18d15258e33f82a.zip | |
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp/ert.el')
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 2eba0216faf..21c1f1be394 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -64,7 +64,7 @@ (require 'ewoc) (require 'find-func) (require 'help) - +(require 'pp) ;;; UI customization options. @@ -1300,7 +1300,8 @@ EXPECTEDP specifies whether the result was expected." (defun ert--pp-with-indentation-and-newline (object) "Pretty-print OBJECT, indenting it to the current column of point. Ensures a final newline is inserted." - (let ((begin (point))) + (let ((begin (point)) + (pp-escape-newlines nil)) (pp object (current-buffer)) (unless (bolp) (insert "\n")) (save-excursion |