From 2baccd04ce0fa1992700216de6f8f7bca6e34947 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 15 Apr 2011 20:03:01 -0700 Subject: [PATCH] * xsmfns.c (create_client_leader_window): Rename shadowing arg. --- src/ChangeLog | 2 ++ src/xsmfns.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index bb4cdf3663e..19d40d41737 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-04-16 Paul Eggert + * xsmfns.c (create_client_leader_window): Rename shadowing arg. + * xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local. * xfns.c (free_frame_menubar, atof): Remove duplicate decls. diff --git a/src/xsmfns.c b/src/xsmfns.c index f3879dbcec0..50f7fa3d15b 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -42,7 +42,7 @@ along with GNU Emacs. If not, see . */ #include "keyboard.h" #ifndef HAVE_GTK3 -#define gdk_x11_set_sm_client_id(w) gdk_set_sm_client_id (w) +#define gdk_x11_set_sm_client_id(w) gdk_set_sm_client_id (w) #endif /* This is the event used when SAVE_SESSION_EVENT occurs. */ @@ -250,7 +250,7 @@ smc_save_yourself_CB (SmcConn smcConn, props[props_idx]->vals[vp_idx++].value = chdir_opt; } - for (i = 1; i < initial_argc; ++i) + for (i = 1; i < initial_argc; ++i) { props[props_idx]->vals[vp_idx].length = strlen (initial_argv[i]); props[props_idx]->vals[vp_idx++].value = initial_argv[i]; @@ -365,7 +365,7 @@ ice_conn_watch_CB (IceConn iceConn, IcePointer clientData, #ifndef USE_GTK static void -create_client_leader_window (struct x_display_info *dpyinfo, char *client_id) +create_client_leader_window (struct x_display_info *dpyinfo, char *client_ID) { Window w; XClassHint class_hints; @@ -383,7 +383,7 @@ create_client_leader_window (struct x_display_info *dpyinfo, char *client_id) XChangeProperty (dpyinfo->display, w, dpyinfo->Xatom_SM_CLIENT_ID, XA_STRING, 8, PropModeReplace, - (unsigned char *)client_id, strlen (client_id)); + (unsigned char *) client_ID, strlen (client_ID)); dpyinfo->client_leader_window = w; } -- 2.39.2