(w32_ring_bell): Only support visible bell on w32

frames.
(w32_initialize): Don't set term hooks that aren't actually needed
in windowed mode.

2 files changed, 32 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dc7e39113b9..6bbc6054bc2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,31 @@
+2001-01-20  Andrew Innes  <andrewi@gnu.org>
+
+	* w32term.c (w32_ring_bell): Only support visible bell on w32
+	frames.
+	(w32_initialize): Don't set term hooks that aren't actually needed
+	in windowed mode.
+
+	* xfaces.c (realize_default_face):
+	(realize_face):
+	(realize_tty_face): Remove references to FRAME_W32_CONSOLE_P.
+
+	* xdisp.c (handle_single_display_prop): Remove references to
+	FRAME_W32_CONSOLE_P.
+
+	* dispnew.c (Fredraw_frame): Remove reference to
+	FRAME_W32_CONSOLE_P.
+
+	* frame.h (output_method): Remove output_w32_console method.
+	(FRAME_W32_CONSOLE_P): Remove macro.
+
+	* frame.c (Qw32_console): Remove variable.
+	(Fframep): Remove references to it.
+	(syms_of_frame): Ditto.
+	(Fframe_parameters): Remove references to FRAME_W32_CONSOLE_P.
+
+	* term.c (FRAME_TERMCAP_P) [WINDOWSNT]: Reinstate original
+	redefinition.
+
 2001-01-20  Kenichi Handa  <handa@etl.go.jp>
 
 	* editfns.c (Fformat): Use lisp_string_width instead of strwidth.
diff --git a/src/w32term.c b/src/w32term.c
index 0af66377c76..0d6f8c4bf20 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5314,12 +5314,9 @@ w32_ring_bell (void)
 
   f = SELECTED_FRAME ();
 
-  if (! FRAME_W32_P (f))
-    return;
-
   BLOCK_INPUT;
 
-  if (visible_bell)
+  if (FRAME_W32_P (f) && visible_bell)
     {
       int i;
       HWND hwnd = FRAME_W32_WINDOW (SELECTED_FRAME ());
@@ -10304,18 +10301,14 @@ w32_initialize ()
   /* MSVC does not type K&R functions with no arguments correctly, and
      so we must explicitly cast them.  */
   clear_frame_hook = (void (*)(void)) x_clear_frame;
-  ins_del_lines_hook = x_ins_del_lines;
-  change_line_highlight_hook = x_change_line_highlight;
-  delete_glyphs_hook = x_delete_glyphs;
   ring_bell_hook = (void (*)(void)) w32_ring_bell;
-  reset_terminal_modes_hook = (void (*)(void)) w32_reset_terminal_modes;
-  set_terminal_modes_hook = (void (*)(void)) w32_set_terminal_modes;
   update_begin_hook = x_update_begin;
   update_end_hook = x_update_end;
-  set_terminal_window_hook = w32_set_terminal_window;
+
   read_socket_hook = w32_read_socket;
+
   frame_up_to_date_hook = w32_frame_up_to_date;
-  reassert_line_highlight_hook = w32_reassert_line_highlight;
+
   mouse_position_hook = w32_mouse_position;
   frame_rehighlight_hook = w32_frame_rehighlight;
   frame_raise_lower_hook = w32_frame_raise_lower;