Merge from trunk.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c9706aa3a37..3862ce46327 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,8 +6,6 @@
         Without this fix, (bitmap-spec-p '(34359738368 1 "x"))
         would wrongly return t on a 64-bit host.
 
-2011-07-11  Paul Eggert  <eggert@cs.ucla.edu>
-
         * dispnew.c (init_display): Use *_RANGE_OVERFLOW macros.
         The plain *_OVERFLOW macros run afoul of GCC bug 49705
         <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49705>
@@ -164,6 +162,18 @@
         Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
         well either way, and we prefer signed to unsigned.
 
+2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor new problems caught by GCC 4.6.1.
+        * term.c (init_tty): Remove unused local.
+        * xsettings.c (store_monospaced_changed): Define this function only
+        if (defined HAVE_GSETTINGS || defined HAVE_GCONF), as it's
+        not used otherwise.
+
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (Vresize_mini_windows): Minor doc fix (Bug#3300).
+
 2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * xdisp.c (syms_of_xdisp): Make it explicit that the mini-windows