[Emacs-diffs] Changes to emacs/src/w32term.c [lexbind]

[Miles Bader]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.161.2.11 emacs/src/w32term.c:1.161.2.12
*** emacs/src/w32term.c:1.161.2.11      Sat May  1 23:46:19 2004
--- emacs/src/w32term.c Tue Jul  6 09:14:38 2004
***************
*** 177,183 ****
  static RECT last_mouse_glyph;
  static Lisp_Object last_mouse_press_frame;
  
! Lisp_Object Vw32_num_mouse_buttons;
  
  Lisp_Object Vw32_swap_mouse_buttons;
  
--- 177,183 ----
  static RECT last_mouse_glyph;
  static Lisp_Object last_mouse_press_frame;
  
! int w32_num_mouse_buttons;
  
  Lisp_Object Vw32_swap_mouse_buttons;
  
***************
*** 4360,4369 ****
  
            /* If the contents of the global variable help_echo_string
               has changed, generate a HELP_EVENT.  */
            if (help_echo_string != previous_help_echo_string ||
              (!NILP (help_echo_string) && !STRINGP (help_echo_string) && 
f->mouse_moved))
            do_help = 1;
! 
            break;
  
        case WM_LBUTTONDOWN:
--- 4360,4375 ----
  
            /* 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,4790 ****
  
          if (do_help > 0)
            {
!             if (help_echo_string == Qnil)
                {
                  help_echo_object = help_echo_window = Qnil;
                  help_echo_pos = -1;
--- 4790,4796 ----
  
          if (do_help > 0)
            {
!             if (NILP (help_echo_string))
                {
                  help_echo_object = help_echo_window = Qnil;
                  help_echo_pos = -1;
***************
*** 6459,6467 ****
    Qvendor_specific_keysyms = intern ("vendor-specific-keysyms");
  
    DEFVAR_INT ("w32-num-mouse-buttons",
!             &Vw32_num_mouse_buttons,
              doc: /* Number of physical mouse buttons.  */);
!   Vw32_num_mouse_buttons = Qnil;
  
    DEFVAR_LISP ("w32-swap-mouse-buttons",
              &Vw32_swap_mouse_buttons,
--- 6465,6473 ----
    Qvendor_specific_keysyms = intern ("vendor-specific-keysyms");
  
    DEFVAR_INT ("w32-num-mouse-buttons",
!             &w32_num_mouse_buttons,
              doc: /* Number of physical mouse buttons.  */);
!   w32_num_mouse_buttons = 2;
  
    DEFVAR_LISP ("w32-swap-mouse-buttons",
              &Vw32_swap_mouse_buttons,