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

[Miles Bader]

Index: emacs/src/w32.c
diff -c emacs/src/w32.c:1.75.2.3 emacs/src/w32.c:1.75.2.4
*** emacs/src/w32.c:1.75.2.3    Sun Dec 28 05:20:01 2003
--- emacs/src/w32.c     Tue Jul  6 09:14:37 2004
***************
*** 105,111 ****
  extern Lisp_Object Vw32_downcase_file_names;
  extern Lisp_Object Vw32_generate_fake_inodes;
  extern Lisp_Object Vw32_get_true_file_attributes;
! extern Lisp_Object Vw32_num_mouse_buttons;
  
  
  /*
--- 105,111 ----
  extern Lisp_Object Vw32_downcase_file_names;
  extern Lisp_Object Vw32_generate_fake_inodes;
  extern Lisp_Object Vw32_get_true_file_attributes;
! extern int w32_num_mouse_buttons;
  
  
  /*
***************
*** 1094,1100 ****
    /* Determine if there is a middle mouse button, to allow parse_button
       to decide whether right mouse events should be mouse-2 or
       mouse-3. */
!   XSETINT (Vw32_num_mouse_buttons, GetSystemMetrics (SM_CMOUSEBUTTONS));
  
    init_user_info ();
  }
--- 1094,1100 ----
    /* Determine if there is a middle mouse button, to allow parse_button
       to decide whether right mouse events should be mouse-2 or
       mouse-3. */
!   w32_num_mouse_buttons = GetSystemMetrics (SM_CMOUSEBUTTONS);
  
    init_user_info ();
  }
***************
*** 1627,1633 ****
  /* Support shares on a network resource as subdirectories of a read-only
     root directory. */
  static HANDLE wnet_enum_handle = INVALID_HANDLE_VALUE;
! HANDLE open_unc_volume (char *);
  char  *read_unc_volume (HANDLE, char *, int);
  void   close_unc_volume (HANDLE);
  
--- 1627,1633 ----
  /* Support shares on a network resource as subdirectories of a read-only
     root directory. */
  static HANDLE wnet_enum_handle = INVALID_HANDLE_VALUE;
! HANDLE open_unc_volume (const char *);
  char  *read_unc_volume (HANDLE, char *, int);
  void   close_unc_volume (HANDLE);
  
***************
*** 1740,1746 ****
  }
  
  HANDLE
! open_unc_volume (char *path)
  {
    NETRESOURCE nr;
    HANDLE henum;
--- 1740,1746 ----
  }
  
  HANDLE
! open_unc_volume (const char *path)
  {
    NETRESOURCE nr;
    HANDLE henum;
***************
*** 1797,1803 ****
  }
  
  DWORD
! unc_volume_file_attributes (char *path)
  {
    HANDLE henum;
    DWORD attrs;
--- 1797,1803 ----
  }
  
  DWORD
! unc_volume_file_attributes (const char *path)
  {
    HANDLE henum;
    DWORD attrs;
***************
*** 3486,3492 ****
  }
  
  /* From ntproc.c */
! extern Lisp_Object Vw32_pipe_read_delay;
  
  /* Function to do blocking read of one byte, needed to implement
     select.  It is only allowed on sockets and pipes. */
--- 3486,3492 ----
  }
  
  /* From ntproc.c */
! extern int w32_pipe_read_delay;
  
  /* Function to do blocking read of one byte, needed to implement
     select.  It is only allowed on sockets and pipes. */
***************
*** 3526,3532 ****
         shell on NT is very slow if we don't do this. */
        if (rc > 0)
        {
!         int wait = XINT (Vw32_pipe_read_delay);
  
          if (wait > 0)
            Sleep (wait);
--- 3526,3532 ----
         shell on NT is very slow if we don't do this. */
        if (rc > 0)
        {
!         int wait = w32_pipe_read_delay;
  
          if (wait > 0)
            Sleep (wait);