Merge: Fix minor new problems caught by GCC 4.6.1.

diff --cc src/ChangeLog
index 4f285c0,a52f71b..54637fe
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,11 +1,11 @@@
 -      Fix recently-introduced minor problems.
+ 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+ 
 -      if (defined HAVE_GSETTINGS || define defined HAVE_GCONF), as it's
++      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).