master updated (e3f8dd9023 -> ae3416d694)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  e3f8dd9023 ; * lisp/mwheel.el (mouse-wheel-scroll-amount): Doc fix.
       new  8bb770234d Fix warning in last commit
       new  b000bd47a6 Font lock \\<> and \\{} command substitutions in 
docstrings
       new  e688176b21 Use substitute-command-keys in reftex-toc-show-help
       new  5cb8303f6b Normalize definition of erc-track-minor-mode-map
       new  bda6e9a226 Use command substitutions instead of literal keys in 
some places
       new  05297e40c0 Quote some literal keys to get help-key-binding face
       new  ae3416d694 Simplify lisp-el-font-lock-keywords-2 definition slightly


Summary of changes:
 lisp/align.el                    |  4 +--
 lisp/bindings.el                 |  2 +-
 lisp/calc/calc-embed.el          |  3 ++-
 lisp/calc/calc-misc.el           | 56 ++++++++++++++++++++--------------------
 lisp/calc/calc-prog.el           |  2 +-
 lisp/calc/calc-yank.el           |  4 +--
 lisp/comint.el                   |  4 +--
 lisp/dired.el                    |  2 +-
 lisp/emacs-lisp/lisp-mode.el     | 20 +++++++-------
 lisp/emulation/viper-macs.el     |  8 +++---
 lisp/emulation/viper.el          | 10 +++----
 lisp/erc/erc-button.el           |  2 +-
 lisp/erc/erc-track.el            | 12 ++++-----
 lisp/gnus/gnus-art.el            |  2 +-
 lisp/gnus/gnus-eform.el          |  2 +-
 lisp/gnus/gnus-sum.el            |  6 ++---
 lisp/icomplete.el                |  2 +-
 lisp/image-mode.el               |  4 +--
 lisp/international/iso-transl.el |  4 +--
 lisp/isearch.el                  |  2 +-
 lisp/minibuffer.el               |  3 ++-
 lisp/misc.el                     |  2 +-
 lisp/outline.el                  |  9 +++----
 lisp/progmodes/grep.el           |  2 +-
 lisp/progmodes/gud.el            | 16 ++++++------
 lisp/progmodes/idlw-shell.el     |  4 +--
 lisp/progmodes/idlwave.el        |  6 ++---
 lisp/progmodes/python.el         |  3 ++-
 lisp/repeat.el                   |  4 +--
 lisp/replace.el                  | 12 ++++-----
 lisp/simple.el                   |  2 +-
 lisp/speedbar.el                 |  3 ++-
 lisp/subr.el                     |  2 +-
 lisp/tab-bar.el                  |  4 +--
 lisp/term.el                     |  2 +-
 lisp/textmodes/page-ext.el       | 15 ++++++-----
 lisp/textmodes/reftex-index.el   |  4 +--
 lisp/textmodes/reftex-toc.el     | 40 +++++++++++++++-------------
 lisp/vc/emerge.el                |  4 +--
 lisp/windmove.el                 |  2 +-
 lisp/winner.el                   |  4 +--
 41 files changed, 154 insertions(+), 140 deletions(-)