4 files changed, 22 insertions, 11 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
diff --git a/src/term.c b/src/term.c
index b9f10b122a7..22056451cb9 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3097,7 +3097,6 @@ init_tty (const char *name, const char *terminal_type, int must_succeed)
   char *area = NULL;
   char **address = &area;
   int buffer_size = 4096;
-  register char *p = NULL;
   int status;
   struct tty_display_info *tty = NULL;
   struct terminal *terminal = NULL;
diff --git a/src/xdisp.c b/src/xdisp.c
index 490b23891af..123d2fa984c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26852,12 +26852,12 @@ If an integer, it specifies a number of lines.  */);
   Vmax_mini_window_height = make_float (0.25);
 
   DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows,
-    doc: /* *How to resize mini-windows (the minibuffer and the echo area).
+    doc: /* How to resize mini-windows (the minibuffer and the echo area).
 A value of nil means don't automatically resize mini-windows.
 A value of t means resize them to fit the text displayed in them.
-A value of `grow-only', the default, means let mini-windows grow
-only, until their display becomes empty, at which point the windows
-go back to their normal size.  */);
+A value of `grow-only', the default, means let mini-windows grow only;
+they return to their normal size when the minibuffer is closed, or the
+echo area becomes empty.  */);
   Vresize_mini_windows = Qgrow_only;
 
   DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist,
diff --git a/src/xsettings.c b/src/xsettings.c
index 06718df5a3c..dadbe68b4cb 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -83,7 +83,7 @@ dpyinfo_valid (struct x_display_info *dpyinfo)
 
 /* Store a monospace font change event if the monospaced font changed.  */
 
-#ifdef HAVE_XFT
+#if defined HAVE_XFT && (defined HAVE_GSETTINGS || defined HAVE_GCONF)
 static void
 store_monospaced_changed (const char *newfont)
 {
@@ -99,9 +99,11 @@ store_monospaced_changed (const char *newfont)
                                   XCAR (first_dpyinfo->name_list_element));
     }
 }
+#endif
 
 /* Store a font name change event if the font name changed.  */
 
+#ifdef HAVE_XFT
 static void
 store_font_name_changed (const char *newfont)
 {
@@ -252,7 +254,7 @@ something_changed_gsettingsCB (GSettings *settings,
           g_variant_unref (val);
         }
     }
-#endif /* HAVE_XFT */  
+#endif /* HAVE_XFT */
 }
 
 #endif /* HAVE_GSETTINGS */
@@ -441,14 +443,14 @@ parse_settings (unsigned char *prop,
       bytes_parsed += 4; /* Skip serial for this value */
       if (bytes_parsed > bytes) return BadLength;
 
-      want_this = 
+      want_this =
 #ifdef HAVE_XFT
         (nlen > 6 && strncmp (name, "Xft/", 4) == 0)
         || strcmp (XSETTINGS_FONT_NAME, name) == 0
         ||
 #endif
         strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0;
-  
+
       switch (type)
         {
         case 0: /* Integer */