From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 30 Nov 2013 15:51:16 +0000 (+0100)
Subject: src/w32term.c,window.c,xdisp.c: Remove unused variables.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~623
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ae87264fd7d9ce6614e7048bc57a431d480098a;p=emacs.git

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'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 794eb0f82c2..2a24c4b1ba8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2013-11-30  Juanma Barranquero  <lekktu@gmail.com>
+
+	* xdisp.c (Fwindow_text_pixel_size): Remove unused variables
+	`value' and `endp'.
+
+	* window.c (Fset_window_configuration): Comment out unused variables.
+
+	* w32term.c (w32_read_socket): Remove unused variable `buf'.
+
 2013-11-30  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* 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,
   struct frame *f;
   struct w32_display_info *dpyinfo = &one_w32_display_info;
   Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
-  static char buf[1];
 
   block_input ();
 
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)
 				   ? FRAME_COLUMN_WIDTH (f)
 				   : FRAME_LINE_HEIGHT (f));
     }
-  else    
+  else
     {
       new_size= (horflag
 		 ? size
@@ -4657,7 +4657,7 @@ grow_mini_window (struct window *w, int delta, bool pixelwise)
 	    }
 	  else
 	    {
-	      line_height = -XINT (height); 
+	      line_height = -XINT (height);
 	      pixel_height = line_height * FRAME_LINE_HEIGHT (f);
 	    }
 
@@ -4687,7 +4687,7 @@ shrink_mini_window (struct window *w, bool pixelwise)
 
   eassert (MINI_WINDOW_P (w));
 
-  height = pixelwise ? w->pixel_height : w->total_lines; 
+  height = pixelwise ? w->pixel_height : w->total_lines;
   unit = pixelwise ? FRAME_LINE_HEIGHT (f) : 1;
   if (height > unit)
     {
@@ -6078,10 +6078,10 @@ the return value is nil.  Otherwise the value is t.  */)
 	 back.  We keep track of the prevailing height in these variables.  */
       int previous_frame_text_height = FRAME_TEXT_HEIGHT (f);
       int previous_frame_text_width =  FRAME_TEXT_WIDTH  (f);
-      int previous_frame_menu_bar_height = FRAME_MENU_BAR_HEIGHT (f);
-      int previous_frame_tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f);
-      int previous_frame_lines = FRAME_LINES (f);
-      int previous_frame_cols =  FRAME_COLS  (f);
+      /* int previous_frame_menu_bar_height = FRAME_MENU_BAR_HEIGHT (f); */
+      /* int previous_frame_tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f); */
+      /* int previous_frame_lines = FRAME_LINES (f); */
+      /* int previous_frame_cols =  FRAME_COLS  (f); */
       int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);
       int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f);
 
@@ -6353,7 +6353,7 @@ the return value is nil.  Otherwise the value is t.  */)
       /* This `select_window' calls record_buffer which calls Fdelq which
 	 invokes QUIT, so we do it here at the end rather than earlier,
 	 to minimize the risk of interrupting the Fset_window_configuration
-	 in an inconsistent state (e.g. before frame-focus redirection is 
+	 in an inconsistent state (e.g. before frame-focus redirection is
 	 canceled).  */
       select_window (data->current_window, Qnil, 1);
       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.  */)
    Lisp_Object mode_and_header_line)
 {
   struct window *w = decode_live_window (window);
-  Lisp_Object buf, value;
+  Lisp_Object buf;
   struct buffer *b;
   struct it it;
   struct buffer *old_buffer = NULL;
   ptrdiff_t start, end, pos;
-  struct text_pos startp, endp;
+  struct text_pos startp;
   void *itdata = NULL;
   int c, max_y = -1, x = 0, y = 0;