procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge: Fix minor new problems caught by GCC 4.6.1.

Browse source
This commit is contained in:
Paul Eggert 2011-07-12 10:29:33 -07:00
commit 077e3dda94
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
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).

1
src/term.c
View file

@ -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;

10
src/xsettings.c
View file

@ -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 */