mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 22:41:06 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24; up to 2014-06-19T14:03:45Z!monnier@iro.umontreal.ca

Browse source
This commit is contained in:
Glenn Morris 2014-07-08 19:04:12 -07:00
commit 5613a6f6d5
25 changed files with 344 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/edebug.el
View file

@ -497,7 +497,7 @@ the minibuffer."
(setq edebug-result (eval (eval-sexp-add-defvars form) lexical-binding))
(if (not edebugging)
(prog1
(princ edebug-result)
(prin1 edebug-result)
(let ((str (eval-expression-print-format edebug-result)))
(if str (princ str))))
edebug-result)))