master updated (5aa5c03 -> 18ae12e)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  5aa5c03   Merge branch 'master' of 
git.savannah.gnu.org:/srv/git/emacs
       new  77a5b69   Fix binding mouse wheel with modifiers in buffer area
       new  76e8d93   Simplify mwheel-mode by using alist instead of two 
variables
       new  18ae12e   Use lexical-binding in mwheel.el


Summary of changes:
 lisp/mwheel.el            | 58 +++++++++++++++++++++++++++--------------------
 test/lisp/mwheel-tests.el | 26 +++++++++++++--------
 2 files changed, 51 insertions(+), 33 deletions(-)