master updated (18d412a513 -> 38ae6cf3ce)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  18d412a513 Fix non-system-malloc build
       new  cc06be904c * lisp/bs.el (bs-mode-map): Prefer defvar-keymap.
       new  38ae6cf3ce Prefer Emacs mouse button event names to XEmacs names


Summary of changes:
 lisp/bs.el            | 108 ++++++++++++++++++++++++++------------------------
 lisp/mwheel.el        |   7 ++--
 lisp/vc/ediff-mult.el |   6 +--
 3 files changed, 63 insertions(+), 58 deletions(-)