master updated (ee913faf9a -> bcdcaf0219)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  ee913faf9a Fix eldoc interaction with `when' and `unless'
       new  f639fa9f9e Make non-recursive error messages in edebug prettier
       new  bcdcaf0219 Make the eval-in-debug error message prettier in 
non-recursive errors


Summary of changes:
 lisp/emacs-lisp/debug.el  | 28 +++++++++++++++++-----------
 lisp/emacs-lisp/edebug.el | 27 +++++++++++++++++++--------
 2 files changed, 36 insertions(+), 19 deletions(-)