Merge from emacs--devo--0

[gnu-emacs] / src / msdos.c

diff --git a/src/msdos.c b/src/msdos.c
index ee899d1bee42307b844848e890a7cf303c494575..4e989402a8015d52b134116e94f2c91fcd7dd0b7 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities.          -*- coding: raw-text -*-
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -204,9 +204,9 @@ them.  This happens with wheeled mice on Windows 9X, for example.  */)
   CHECK_NUMBER (nbuttons);
   n = XINT (nbuttons);
   if (n < 2 || n > 3)
-    Fsignal (Qargs_out_of_range,
-            Fcons (build_string ("only 2 or 3 mouse buttons are supported"),
-                   Fcons (nbuttons, Qnil)));
+    xsignal2 (Qargs_out_of_range,
+             build_string ("only 2 or 3 mouse buttons are supported"),
+             nbuttons);
   mouse_setup_buttons (n);
   return Qnil;
 }
@@ -2639,7 +2639,7 @@ check_x (void)
 #define Ctrl   0x0200  /* ctrl scan-code */
 #define Shift  0x0400  /* shift scan-code */
 
-static int extended_kbd; /* 101 (102) keyboard present.        */
+static int extended_kbd; /* 101 (102) keyboard present. */
 
 struct kbd_translate {
   unsigned char  sc;
@@ -3381,7 +3381,7 @@ dos_rawgetc ()
            }
 
          /* Generate SELECT_WINDOW_EVENTs when needed.  */
-         if (mouse_autoselect_window)
+         if (!NILP (Vmouse_autoselect_window))
            {
              mouse_window = window_from_coordinates (SELECTED_FRAME(),
                                                      mouse_last_x,
@@ -5300,7 +5300,7 @@ This variable is used only by MSDOS terminals.  */);
 #ifndef subprocesses
   DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes,
               doc: /* *Non-nil means delete processes immediately when they exit.
-nil means don't delete them until `list-processes' is run.  */);
+A value of nil means don't delete them until `list-processes' is run.  */);
   delete_exited_processes = 0;
 #endif