aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-01 13:30:45 -0700
committerPaul Eggert2011-04-01 13:30:45 -0700
commit0ce7538dd218ee85ac22ab7a9f5aae87f34a5e26 (patch)
tree78535a01375c8398ae7826fcedd82c481238a0b2
parent8e48d7bc3fef6ca11af98c12d99426bd01a5b3de (diff)
downloademacs-0ce7538dd218ee85ac22ab7a9f5aae87f34a5e26.tar.gz
emacs-0ce7538dd218ee85ac22ab7a9f5aae87f34a5e26.zip
* xfns.c (x_create_tip_frame): Remove var that is set but not used.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xfns.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 56400fbb08f..437924fe4a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-01 Paul Eggert <eggert@cs.ucla.edu> 12011-04-01 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xfns.c (x_create_tip_frame): Remove var that is set but not used.
4
3 * xterm.c (x_scroll_bar_to_input_event) [!USE_GTK]: 5 * xterm.c (x_scroll_bar_to_input_event) [!USE_GTK]:
4 Remove var that is set but not used. 6 Remove var that is set but not used.
5 (scroll_bar_windows_size): Now size_t, not int. 7 (scroll_bar_windows_size): Now size_t, not int.
diff --git a/src/xfns.c b/src/xfns.c
index e50d6887179..39c77b8c8c7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4579,7 +4579,6 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
4579 struct frame *f; 4579 struct frame *f;
4580 Lisp_Object frame; 4580 Lisp_Object frame;
4581 Lisp_Object name; 4581 Lisp_Object name;
4582 long window_prompting = 0;
4583 int width, height; 4582 int width, height;
4584 int count = SPECPDL_INDEX (); 4583 int count = SPECPDL_INDEX ();
4585 struct gcpro gcpro1, gcpro2, gcpro3; 4584 struct gcpro gcpro1, gcpro2, gcpro3;
@@ -4757,7 +4756,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
4757 4756
4758 f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; 4757 f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
4759 4758
4760 window_prompting = x_figure_window_size (f, parms, 0); 4759 x_figure_window_size (f, parms, 0);
4761 4760
4762 { 4761 {
4763 XSetWindowAttributes attrs; 4762 XSetWindowAttributes attrs;