master updated (9c126cbacb -> bd464297bd)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  9c126cbacb * doc/lispref/help.texi (Keys in Documentation): Typo in 
last change
       new  cd87a5c7a1 Don't clear out local variables in `with-help-window'
       new  bd464297bd Don't overwrite variables set by callback in 
help--window-setup


Summary of changes:
 lisp/help-mode.el |  5 ++++-
 lisp/help.el      | 60 +++++++++++++++++++++++++++----------------------------
 2 files changed, 33 insertions(+), 32 deletions(-)