# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1084830202 0
# Node ID 358a5c0b45716e621381628f938e5aa203743a29
# Parent  5b3f2477d17b10cb7aee2a5778c22cd457d676dc
(w32_num_mouse_buttons): Rename from Vw32_num_mouse_buttons and make
it an int.

diff -r 5b3f2477d17b -r 358a5c0b4571 src/w32term.c
--- a/src/w32term.c	Mon May 17 21:33:16 2004 +0000
+++ b/src/w32term.c	Mon May 17 21:43:22 2004 +0000
@@ -177,7 +177,7 @@
 static RECT last_mouse_glyph;
 static Lisp_Object last_mouse_press_frame;
 
-Lisp_Object Vw32_num_mouse_buttons;
+int w32_num_mouse_buttons;
 
 Lisp_Object Vw32_swap_mouse_buttons;
 
@@ -4360,10 +4360,16 @@
 
           /* If the contents of the global variable help_echo_string
              has changed, generate a HELP_EVENT.  */
+#if 0 /* The below is an invalid comparison when USE_LISP_UNION_TYPE.
+	 But it was originally changed to this to fix a bug, so I have
+	 not removed it completely in case the bug is still there.  */
           if (help_echo_string != previous_help_echo_string ||
 	      (!NILP (help_echo_string) && !STRINGP (help_echo_string) && f->mouse_moved))
+#else /* This is what xterm.c does.  */
+	    if (!NILP (help_echo_string)
+		|| !NILP (previous_help_echo_string))
 	    do_help = 1;
-
+#endif
           break;
 
 	case WM_LBUTTONDOWN:
@@ -4784,7 +4790,7 @@
 
 	  if (do_help > 0)
 	    {
-	      if (help_echo_string == Qnil)
+	      if (NILP (help_echo_string))
 		{
 		  help_echo_object = help_echo_window = Qnil;
 		  help_echo_pos = -1;
@@ -6459,9 +6465,9 @@
   Qvendor_specific_keysyms = intern ("vendor-specific-keysyms");
 
   DEFVAR_INT ("w32-num-mouse-buttons",
-	      &Vw32_num_mouse_buttons,
+	      &w32_num_mouse_buttons,
 	      doc: /* Number of physical mouse buttons.  */);
-  Vw32_num_mouse_buttons = Qnil;
+  w32_num_mouse_buttons = 2;
 
   DEFVAR_LISP ("w32-swap-mouse-buttons",
 	      &Vw32_swap_mouse_buttons,