Handle overflow when computing char display width (Bug#9496).

[gnu-emacs] / src / xsettings.c

diff --git a/src/xsettings.c b/src/xsettings.c
index dadbe68b4cbd5a807db6a90edbb94fffa63d3c4e..066c6e795e91396a86acb7446a0da30097f11282 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -1,6 +1,6 @@
 /* Functions for handling font and other changes dynamically.
 
-Copyright (C) 2009-2011  Free Software Foundation, Inc.
+Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -121,7 +121,7 @@ store_font_name_changed (const char *newfont)
 }
 #endif /* HAVE_XFT */
 
-/* Map TOOL_BAR_STYLE from a string to its correspinding Lisp value.
+/* Map TOOL_BAR_STYLE from a string to its corresponding Lisp value.
    Return Qnil if TOOL_BAR_STYLE is not known.  */
 
 static Lisp_Object
@@ -812,7 +812,7 @@ init_gsettings (void)
   g_type_init ();
 #endif
 
-  schemas = g_settings_list_schemas();
+  schemas = g_settings_list_schemas ();
   if (schemas == NULL) return;
   while (! schema_found && *schemas != NULL)
     schema_found = strcmp (*schemas++, GSETTINGS_SCHEMA) == 0;