[Emacs-diffs] /srv/bzr/emacs/trunk r104901: Merge: minor issues caught by GCC 4.6.0.

[Paul Eggert]

------------------------------------------------------------
revno: 104901 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-02 23:18:50 -0700
message:
  Merge: minor issues caught by GCC 4.6.0.
modified:
  src/ChangeLog
  src/keymap.c
  src/xsettings.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-02 23:40:04 +0000
+++ b/src/ChangeLog     2011-07-03 06:17:19 +0000
@@ -1,3 +1,10 @@
+2011-07-03  Paul Eggert  <address@hidden>
+
+       * xsettings.c (SYSTEM_FONT): Define only when used.
+       No need to define when HAVE_GSETTINGS || !HAVE_XFT.
+
+       * keymap.c (access_keymap_1): Now static.
+
 2011-07-02  Chong Yidong  <address@hidden>
 
        * keyboard.c (command_loop_1): If a down-mouse event is unbound,

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2011-07-02 04:27:41 +0000
+++ b/src/keymap.c      2011-07-03 06:15:12 +0000
@@ -388,7 +388,7 @@
    Returns Qunbound if no binding was found (and returns Qnil if a nil
    binding was found).  */
 
-Lisp_Object
+static Lisp_Object
 access_keymap_1 (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, 
int autoload)
 {
   /* If idx is a list (some sort of mouse click, perhaps?),

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2011-07-01 09:18:46 +0000
+++ b/src/xsettings.c   2011-07-03 06:17:19 +0000
@@ -128,7 +128,6 @@
 #ifdef HAVE_GSETTINGS
 #define GSETTINGS_SCHEMA  "org.gnome.desktop.interface"
 #define SYSTEM_MONO_FONT  "monospace-font-name"
-#define SYSTEM_FONT       "font-name"
 
 static void
 something_changedCB (GSettings *settings,
@@ -153,7 +152,10 @@
 #else
 #ifdef HAVE_GCONF
 #define SYSTEM_MONO_FONT  "/desktop/gnome/interface/monospace_font_name"
-#define SYSTEM_FONT       "/desktop/gnome/interface/font_name"
+
+#ifdef HAVE_XFT
+# define SYSTEM_FONT       "/desktop/gnome/interface/font_name"
+#endif
 
 /* Callback called when something changed in GConf that we care about,
    that is SYSTEM_MONO_FONT.  */
@@ -697,7 +699,7 @@
   g_object_ref_sink (G_OBJECT (gsettings_client));
 
   val = g_settings_get_value (gsettings_client, SYSTEM_MONO_FONT);
-  if (val) 
+  if (val)
     {
       g_variant_ref_sink (val);
       if (g_variant_is_of_type (val, G_VARIANT_TYPE_STRING))