diff options
| author | Paul Eggert | 2011-03-09 17:06:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-09 17:06:01 -0800 |
| commit | 06b0c8a0ddcb60b00fcf60a3dcd8b7193bca3cc7 (patch) | |
| tree | 73a7b8b331100d1f327df4771b6f3360839b8d01 /src | |
| parent | c0951e534c34cb4400bf9dcb18ae40b31a684bae (diff) | |
| download | emacs-06b0c8a0ddcb60b00fcf60a3dcd8b7193bca3cc7.tar.gz emacs-06b0c8a0ddcb60b00fcf60a3dcd8b7193bca3cc7.zip | |
* xfns.c: (x_real_positions, xg_set_icon_from_xpm_data, x_create_tip_frame):
Remove unused locals.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfns.c | 5 |
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 @@ | |||
| 3 | * xfns.c (x_decode_color, x_set_name, x_window): Now static. | 3 | * xfns.c (x_decode_color, x_set_name, x_window): Now static. |
| 4 | (Fx_create_frame): Add braces to silence GCC warning. | 4 | (Fx_create_frame): Add braces to silence GCC warning. |
| 5 | (Fx_file_dialog, Fx_select_font): Fix pointer signedness. | 5 | (Fx_file_dialog, Fx_select_font): Fix pointer signedness. |
| 6 | (x_real_positions, xg_set_icon_from_xpm_data, x_create_tip_frame): | ||
| 7 | Remove unused locals. | ||
| 6 | 8 | ||
| 7 | 2011-03-09 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2011-03-09 Paul Eggert <eggert@cs.ucla.edu> |
| 8 | 10 | ||
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) | |||
| 461 | Window win = f->output_data.x->parent_desc; | 461 | Window win = f->output_data.x->parent_desc; |
| 462 | Atom actual_type; | 462 | Atom actual_type; |
| 463 | unsigned long actual_size, bytes_remaining; | 463 | unsigned long actual_size, bytes_remaining; |
| 464 | int i, rc, actual_format; | 464 | int rc, actual_format; |
| 465 | struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); | 465 | struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
| 466 | long max_len = 400; | 466 | long max_len = 400; |
| 467 | Display *dpy = FRAME_X_DISPLAY (f); | 467 | Display *dpy = FRAME_X_DISPLAY (f); |
| @@ -746,7 +746,6 @@ xg_set_icon (FRAME_PTR f, Lisp_Object file) | |||
| 746 | int | 746 | int |
| 747 | xg_set_icon_from_xpm_data (FRAME_PTR f, const char **data) | 747 | xg_set_icon_from_xpm_data (FRAME_PTR f, const char **data) |
| 748 | { | 748 | { |
| 749 | int result = 0; | ||
| 750 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data); | 749 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data); |
| 751 | 750 | ||
| 752 | if (!pixbuf) | 751 | if (!pixbuf) |
| @@ -4578,7 +4577,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo, | |||
| 4578 | Lisp_Object text) | 4577 | Lisp_Object text) |
| 4579 | { | 4578 | { |
| 4580 | struct frame *f; | 4579 | struct frame *f; |
| 4581 | Lisp_Object frame, tem; | 4580 | Lisp_Object frame; |
| 4582 | Lisp_Object name; | 4581 | Lisp_Object name; |
| 4583 | long window_prompting = 0; | 4582 | long window_prompting = 0; |
| 4584 | int width, height; | 4583 | int width, height; |