2 files changed, 4 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a870511bba..51724faf9c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
         * xfns.c (x_decode_color, x_set_name, x_window): Now static.
         (Fx_create_frame): Add braces to silence GCC warning.
         (Fx_file_dialog, Fx_select_font): Fix pointer signedness.
+        (x_real_positions, xg_set_icon_from_xpm_data, x_create_tip_frame):
+        Remove unused locals.
 
 2011-03-09  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/xfns.c b/src/xfns.c
index 45e0e13dcbc..21453a8958a 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -461,7 +461,7 @@ x_real_positions (FRAME_PTR f, int *xptr, int *yptr)
   Window win = f->output_data.x->parent_desc;
   Atom actual_type;
   unsigned long actual_size, bytes_remaining;
-  int i, rc, actual_format;
+  int rc, actual_format;
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
   long max_len = 400;
   Display *dpy = FRAME_X_DISPLAY (f);
@@ -746,7 +746,6 @@ xg_set_icon (FRAME_PTR f, Lisp_Object file)
 int
 xg_set_icon_from_xpm_data (FRAME_PTR f, const char **data)
 {
-  int result = 0;
   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);
 
   if (!pixbuf)
@@ -4578,7 +4577,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
                     Lisp_Object text)
 {
   struct frame *f;
-  Lisp_Object frame, tem;
+  Lisp_Object frame;
   Lisp_Object name;
   long window_prompting = 0;
   int width, height;