From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 17 Mar 2015 18:32:04 +0000 (+0200)
Subject: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2564^2~147
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0fe787e21ccc1051fab5597b7f5d5b4c325d3258;p=emacs.git

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

0fe787e21ccc1051fab5597b7f5d5b4c325d3258
diff --cc lisp/ChangeLog
index b29694be0d0,b7062bb5c66..b734aaa39e3
--- a/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