Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

diff --cc lisp/ChangeLog
index b29694be0d0e429214bd1a6f7dcc73d3449729ff,b7062bb5c6614facb8c654b21a277243519811e7..b734aaa39e3918355c3aa084a7868442782e1355
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,14 -1,8 +1,19 @@@
 +2015-03-17  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * mouse.el (mouse-appearance-menu): If w32-use-w32-font-dialog is
 +      nil, construct a menu of fixed fonts.  This resurrects a feature
 +      lost in Emacs 23.
 +
 +      * w32-vars.el (w32-use-w32-font-dialog): Add a ':set' function to
 +      reset mouse-appearance-menu-map, so the font dialog is recomputed
 +      the next time the menu is requested.
 +      (w32-fixed-font-alist): Fix to use correct names of Courier fonts.
 +
+ 2015-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/cl-macs.el (cl--transform-lambda): Refine last change
+       (bug#20125).
+ 
  2015-03-17  Michael Albinus  <michael.albinus@gmx.de>
  
        * net/tramp-sh.el (tramp-ssh-controlmaster-options): Change test