Merge from emacs--devo--0

[gnu-emacs] / src / msdos.c

diff --git a/src/msdos.c b/src/msdos.c
index f863984fac3fd4687a9e78160682383a73c00f57..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, 94, 95, 96, 97, 1999, 2000, 01, 2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Contributed by Morten Welinder */
 /* New display, keyboard, and mouse control by Kim F. Storm */
@@ -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,
@@ -3799,15 +3799,15 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
   screensize = screen_size * 2;
   faces[0]
     = lookup_derived_face (sf, intern ("msdos-menu-passive-face"),
-                          DEFAULT_FACE_ID);
+                          DEFAULT_FACE_ID, 1);
   faces[1]
     = lookup_derived_face (sf, intern ("msdos-menu-active-face"),
-                          DEFAULT_FACE_ID);
+                          DEFAULT_FACE_ID, 1);
   selectface = intern ("msdos-menu-select-face");
   faces[2] = lookup_derived_face (sf, selectface,
-                                 faces[0]);
+                                 faces[0], 1);
   faces[3] = lookup_derived_face (sf, selectface,
-                                 faces[1]);
+                                 faces[1], 1);
 
   /* Make sure the menu title is always displayed with
      `msdos-menu-active-face', no matter where the mouse pointer is.  */
@@ -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