From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 12 Jul 2011 17:29:33 +0000 (-0700)
Subject: Merge: Fix minor new problems caught by GCC 4.6.1.
X-Git-Tag: emacs-pretest-24.0.90~104^2~347
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=077e3dda9478f958acb9c9d5b98e0f739726dea7;p=emacs.git

Merge: Fix minor new problems caught by GCC 4.6.1.
---

077e3dda9478f958acb9c9d5b98e0f739726dea7
diff --cc src/ChangeLog
index 4f285c069cf,a52f71bbf7b..54637fe76fb
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,11 +1,11 @@@
+ 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+ 
 -	Fix recently-introduced minor problems.
++	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 || define defined HAVE_GCONF), as it's
++	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).