master updated (2970dbaa32 -> 1da392d62d)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  2970dbaa32 Document `keymap-lookup' in the lipsref manual
       new  0d5bda36fb Document keymap-set-after in Modifying Menus in lispref
       new  1da392d62d Fix fontification in diff--font-lock-prettify


Summary of changes:
 doc/lispref/keymaps.texi | 10 +++++-----
 lisp/vc/diff-mode.el     | 24 +++++++++++-------------
 2 files changed, 16 insertions(+), 18 deletions(-)