emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r105136: Merge: Fix minor new problem


From: Paul Eggert
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r105136: Merge: Fix minor new problems caught by GCC 4.6.1.
Date: Tue, 12 Jul 2011 10:29:33 -0700
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 105136 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-12 10:29:33 -0700
message:
  Merge: Fix minor new problems caught by GCC 4.6.1.
modified:
  src/ChangeLog
  src/term.c
  src/xsettings.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-12 03:04:06 +0000
+++ b/src/ChangeLog     2011-07-12 17:29:33 +0000
@@ -1,3 +1,11 @@
+2011-07-12  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * xdisp.c (Vresize_mini_windows): Minor doc fix (Bug#3300).

=== modified file 'src/term.c'
--- a/src/term.c        2011-07-11 15:16:10 +0000
+++ b/src/term.c        2011-07-12 16:39:15 +0000
@@ -3097,7 +3097,6 @@
   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;

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2011-07-05 08:21:38 +0000
+++ b/src/xsettings.c   2011-07-12 16:47:56 +0000
@@ -83,7 +83,7 @@
 
 /* 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 @@
                                   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 @@
           g_variant_unref (val);
         }
     }
-#endif /* HAVE_XFT */  
+#endif /* HAVE_XFT */
 }
 
 #endif /* HAVE_GSETTINGS */
@@ -441,14 +443,14 @@
       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 */


reply via email to

[Prev in Thread] Current Thread [Next in Thread]