aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2013-11-30 16:51:16 +0100
committerJuanma Barranquero2013-11-30 16:51:16 +0100
commit6ae87264fd7d9ce6614e7048bc57a431d480098a (patch)
tree446adb3288d77e890bd0de549b0ba5715e7b4bf9 /src
parenta1209bc38de1f31cfae91239e85d449b4e11e110 (diff)
downloademacs-6ae87264fd7d9ce6614e7048bc57a431d480098a.tar.gz
emacs-6ae87264fd7d9ce6614e7048bc57a431d480098a.zip
src/w32term.c,window.c,xdisp.c: Remove unused variables.
* w32term.c (w32_read_socket): Remove unused variable `buf'. * window.c (Fset_window_configuration): Comment out unused variables. * xdisp.c (Fwindow_text_pixel_size): Remove unused variables `value' and `endp'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/w32term.c1
-rw-r--r--src/window.c16
-rw-r--r--src/xdisp.c4
4 files changed, 19 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 794eb0f82c2..2a24c4b1ba8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12013-11-30 Juanma Barranquero <lekktu@gmail.com>
2
3 * xdisp.c (Fwindow_text_pixel_size): Remove unused variables
4 `value' and `endp'.
5
6 * window.c (Fset_window_configuration): Comment out unused variables.
7
8 * w32term.c (w32_read_socket): Remove unused variable `buf'.
9
12013-11-30 Jan Djärv <jan.h.d@swipnet.se> 102013-11-30 Jan Djärv <jan.h.d@swipnet.se>
2 11
3 * xdisp.c (redisplay_internal): unrequest_sigio => request_sigio. 12 * xdisp.c (redisplay_internal): unrequest_sigio => request_sigio.
diff --git a/src/w32term.c b/src/w32term.c
index 38b297810b1..70625452d09 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4224,7 +4224,6 @@ w32_read_socket (struct terminal *terminal,
4224 struct frame *f; 4224 struct frame *f;
4225 struct w32_display_info *dpyinfo = &one_w32_display_info; 4225 struct w32_display_info *dpyinfo = &one_w32_display_info;
4226 Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight; 4226 Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
4227 static char buf[1];
4228 4227
4229 block_input (); 4228 block_input ();
4230 4229
diff --git a/src/window.c b/src/window.c
index e73c50fc3a1..bf914662df7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4129,7 +4129,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
4129 ? FRAME_COLUMN_WIDTH (f) 4129 ? FRAME_COLUMN_WIDTH (f)
4130 : FRAME_LINE_HEIGHT (f)); 4130 : FRAME_LINE_HEIGHT (f));
4131 } 4131 }
4132 else 4132 else
4133 { 4133 {
4134 new_size= (horflag 4134 new_size= (horflag
4135 ? size 4135 ? size
@@ -4657,7 +4657,7 @@ grow_mini_window (struct window *w, int delta, bool pixelwise)
4657 } 4657 }
4658 else 4658 else
4659 { 4659 {
4660 line_height = -XINT (height); 4660 line_height = -XINT (height);
4661 pixel_height = line_height * FRAME_LINE_HEIGHT (f); 4661 pixel_height = line_height * FRAME_LINE_HEIGHT (f);
4662 } 4662 }
4663 4663
@@ -4687,7 +4687,7 @@ shrink_mini_window (struct window *w, bool pixelwise)
4687 4687
4688 eassert (MINI_WINDOW_P (w)); 4688 eassert (MINI_WINDOW_P (w));
4689 4689
4690 height = pixelwise ? w->pixel_height : w->total_lines; 4690 height = pixelwise ? w->pixel_height : w->total_lines;
4691 unit = pixelwise ? FRAME_LINE_HEIGHT (f) : 1; 4691 unit = pixelwise ? FRAME_LINE_HEIGHT (f) : 1;
4692 if (height > unit) 4692 if (height > unit)
4693 { 4693 {
@@ -6078,10 +6078,10 @@ the return value is nil. Otherwise the value is t. */)
6078 back. We keep track of the prevailing height in these variables. */ 6078 back. We keep track of the prevailing height in these variables. */
6079 int previous_frame_text_height = FRAME_TEXT_HEIGHT (f); 6079 int previous_frame_text_height = FRAME_TEXT_HEIGHT (f);
6080 int previous_frame_text_width = FRAME_TEXT_WIDTH (f); 6080 int previous_frame_text_width = FRAME_TEXT_WIDTH (f);
6081 int previous_frame_menu_bar_height = FRAME_MENU_BAR_HEIGHT (f); 6081 /* int previous_frame_menu_bar_height = FRAME_MENU_BAR_HEIGHT (f); */
6082 int previous_frame_tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f); 6082 /* int previous_frame_tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f); */
6083 int previous_frame_lines = FRAME_LINES (f); 6083 /* int previous_frame_lines = FRAME_LINES (f); */
6084 int previous_frame_cols = FRAME_COLS (f); 6084 /* int previous_frame_cols = FRAME_COLS (f); */
6085 int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f); 6085 int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);
6086 int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f); 6086 int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f);
6087 6087
@@ -6353,7 +6353,7 @@ the return value is nil. Otherwise the value is t. */)
6353 /* This `select_window' calls record_buffer which calls Fdelq which 6353 /* This `select_window' calls record_buffer which calls Fdelq which
6354 invokes QUIT, so we do it here at the end rather than earlier, 6354 invokes QUIT, so we do it here at the end rather than earlier,
6355 to minimize the risk of interrupting the Fset_window_configuration 6355 to minimize the risk of interrupting the Fset_window_configuration
6356 in an inconsistent state (e.g. before frame-focus redirection is 6356 in an inconsistent state (e.g. before frame-focus redirection is
6357 canceled). */ 6357 canceled). */
6358 select_window (data->current_window, Qnil, 1); 6358 select_window (data->current_window, Qnil, 1);
6359 BVAR (XBUFFER (XWINDOW (selected_window)->contents), 6359 BVAR (XBUFFER (XWINDOW (selected_window)->contents),
diff --git a/src/xdisp.c b/src/xdisp.c
index c7395db7d5e..e45a99d29d7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9512,12 +9512,12 @@ include the height of any of these lines in the return value. */)
9512 Lisp_Object mode_and_header_line) 9512 Lisp_Object mode_and_header_line)
9513{ 9513{
9514 struct window *w = decode_live_window (window); 9514 struct window *w = decode_live_window (window);
9515 Lisp_Object buf, value; 9515 Lisp_Object buf;
9516 struct buffer *b; 9516 struct buffer *b;
9517 struct it it; 9517 struct it it;
9518 struct buffer *old_buffer = NULL; 9518 struct buffer *old_buffer = NULL;
9519 ptrdiff_t start, end, pos; 9519 ptrdiff_t start, end, pos;
9520 struct text_pos startp, endp; 9520 struct text_pos startp;
9521 void *itdata = NULL; 9521 void *itdata = NULL;
9522 int c, max_y = -1, x = 0, y = 0; 9522 int c, max_y = -1, x = 0, y = 0;
9523 9523