Commit 4462823e authored by Juanma Barranquero's avatar Juanma Barranquero

Remove or comment out unused variables

* src/w32fns.c (x_set_mouse_color): Comment out variables cursor,
nontext_cursor, mode_cursor, hand_cursor and count.
(x_change_tool_bar_height): Remove variable old_text_height.
(deliver_wm_chars): Remove variable strip_Alt.
(Fw32_shell_execute): Remove variable document_a.
(Fw32_frame_geometry): Remove variable fullboth.
* src/w32term.c (w32_setup_relief_color): Comment out variable
w32_display_info.
(w32_horizontal_scroll_bar_handle_click): Remove variables start, end.
(w32_read_socket): Comment out variables rows, columns.
* src/w32uniscribe.c (uniscribe_check_otf_1): Remove variable rest.
parent 48c38426
......@@ -1299,8 +1299,10 @@ x_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
void
x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
#if 0
Cursor cursor, nontext_cursor, mode_cursor, hand_cursor;
int count;
#endif
int mask_color;
if (!EQ (Qnil, arg))
......@@ -1737,7 +1739,6 @@ x_change_tool_bar_height (struct frame *f, int height)
int unit = FRAME_LINE_HEIGHT (f);
int old_height = FRAME_TOOL_BAR_HEIGHT (f);
int lines = (height + unit - 1) / unit;
int old_text_height = FRAME_TEXT_HEIGHT (f);
Lisp_Object fullscreen;
/* Make sure we redisplay all windows in this frame. */
......@@ -3004,7 +3005,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam,
{
W32Msg wmsg;
DWORD console_modifiers = construct_console_modifiers ();
int *b = buf, strip_Alt = 1, strip_ExtraMods = 1, hairy = 0;
int *b = buf, strip_ExtraMods = 1, hairy = 0;
char *type_CtrlAlt = NULL;
/* XXXX In fact, there may be another case when we need to do the same:
......@@ -7651,7 +7652,7 @@ a ShowWindow flag:
}
else
{
char document_a[MAX_PATH], current_dir_a[MAX_PATH];
char current_dir_a[MAX_PATH];
SHELLEXECUTEINFOA shexinfo_a;
int codepage = codepage_for_filenames (NULL);
int ldoc_a = pWideCharToMultiByte (codepage, 0, doc_w, -1, NULL, 0,
......@@ -8010,7 +8011,6 @@ and width values are in pixels.
int single_menu_bar_height, wrapped_menu_bar_height, menu_bar_height;
int tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f);
int internal_border_width = FRAME_INTERNAL_BORDER_WIDTH (f);
bool fullboth = EQ (get_frame_param (f, Qfullscreen), Qfullboth);
if (FRAME_INITIAL_P (f) || !FRAME_W32_P (f))
return Qnil;
......
......@@ -1596,7 +1596,9 @@ w32_setup_relief_color (struct frame *f, struct relief *relief, double factor,
unsigned long mask = GCForeground;
COLORREF pixel;
COLORREF background = di->relief_background;
#if 0
struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
#endif
/* TODO: Free colors (if using palette)? */
......@@ -4350,8 +4352,6 @@ w32_horizontal_scroll_bar_handle_click (struct scroll_bar *bar, W32Msg *msg,
if (dragging)
{
SCROLLINFO si;
int start = bar->start;
int end = bar->end;
si.cbSize = sizeof (si);
si.fMask = SIF_POS;
......@@ -5159,7 +5159,7 @@ w32_read_socket (struct terminal *terminal,
if (f && !FRAME_ICONIFIED_P (f) && msg.msg.wParam != SIZE_MINIMIZED)
{
RECT rect;
int rows, columns, width, height, text_width, text_height;
int /* rows, columns, */ width, height, text_width, text_height;
if (GetClientRect (msg.msg.hwnd, &rect)
/* GetClientRect evidently returns (0, 0, 0, 0) if
......
......@@ -779,7 +779,6 @@ uniscribe_check_otf_1 (HDC context, Lisp_Object script, Lisp_Object lang,
int max_tags = ARRAYELTS (tags);
int ntags, i, ret = 0;
HRESULT rslt;
Lisp_Object rest;
*retval = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment