Add missing change from rel-22 branch to src/image.c

[gnu-emacs] / src / w32console.c

diff --git a/src/w32console.c b/src/w32console.c
index a9647dcb449bf286bb67f2fb8b5f86e068034ede..d8d2a24f81b5c39a28d53e027273f27adf4d5845 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -534,16 +534,12 @@ vga_stdcolor_name (int idx)
 
 typedef int (*term_hook) ();
 
-/* TEMPORARY HACK to get w32console compiling. To support multiple consoles,
-   this needs to go! */
-struct terminal one_and_only_w32cons;
-
 void
-initialize_w32_display (void)
+initialize_w32_display (struct terminal *term)
 {
   CONSOLE_SCREEN_BUFFER_INFO   info;
-  struct terminal *term = &one_and_only_w32cons;
 
+  term->rif = 0; /* No window based redisplay on the console.  */
   term->cursor_to_hook         = w32con_move_cursor;
   term->raw_cursor_to_hook             = w32con_move_cursor;
   term->clear_to_end_hook              = w32con_clear_to_end;
@@ -563,6 +559,15 @@ initialize_w32_display (void)
   term->read_socket_hook = w32_console_read_socket;
   term->mouse_position_hook = w32_console_mouse_position;
 
+  /* The following are not used on the console.  */
+  term->frame_rehighlight_hook = 0;
+  term->frame_raise_lower_hook = 0;
+  term->set_vertical_scroll_bar_hook = 0;
+  term->condemn_scroll_bars_hook = 0;
+  term->redeem_scroll_bar_hook = 0;
+  term->judge_scroll_bars_hook = 0;
+  term->frame_up_to_date_hook = 0;
+
   /* Initialize interrupt_handle.  */
   init_crit ();
 
@@ -666,24 +671,6 @@ initialize_w32_display (void)
 
 }
 
-/* Initialize the tty-dependent part of frame F.  The frame must
-   already have its device initialized. */
-void
-create_w32cons_output(struct frame *f)
-{
-  struct tty_output *tty;
-
-  if (! FRAME_TERMCAP_P (f))
-    abort ();
-
-  tty = xmalloc (sizeof (struct tty_output));
-  bzero (tty, sizeof (struct tty_output));
-
-  tty->display_info = FRAME_TERMINAL (f)->display_info.tty;
-  tty->display_info->meta_key = 1;
-
-  f->output_data.tty = tty;
-}
 
 DEFUN ("set-screen-color", Fset_screen_color, Sset_screen_color, 2, 2, 0,
        doc: /* Set screen colors.  */)