master updated (cfc754a67c -> 6d3adedcf1)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  cfc754a67c ; remove regexp ambiguity
       new  599aea3012 * src/keymap.c (Fcopy_keymap): Document using 
defvar-keymap.
       new  0b5301fceb Inherit instead of copying keymap in bookmark.el
       new  7882c77a1e Doc fix; quote keys in face-remap.el
       new  6d3adedcf1 ; Fix warning in mwheel.el


Summary of changes:
 lisp/bookmark.el   | 14 +++++++-------
 lisp/face-remap.el | 12 ++++++------
 lisp/mwheel.el     |  1 +
 src/keymap.c       | 10 ++++++++--
 4 files changed, 22 insertions(+), 15 deletions(-)