dynwind fixes

[bpt/emacs.git] / src / dosfns.c

diff --git a/src/dosfns.c b/src/dosfns.c
index e3adf25..c517a0e 100644 (file)
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -1,6 +1,7 @@
 /* MS-DOS specific Lisp utilities.  Coded by Manabu Higashida, 1991.
    Major changes May-July 1993 Morten Welinder (only 10% original code left)
-   Copyright (C) 1991, 1993, 1996-1998, 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996-1998, 2001-2014 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -30,7 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <dos.h>
 #undef gettime
 #undef settime
-#include <setjmp.h>
+
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"
@@ -401,7 +402,7 @@ msdos_stdcolor_idx (const char *name)
 {
   int i;
 
-  for (i = 0; i < sizeof (vga_colors) / sizeof (vga_colors[0]); i++)
+  for (i = 0; i < ARRAYELTS (vga_colors); i++)
     if (xstrcasecmp (name, vga_colors[i]) == 0)
       return i;
 
@@ -421,7 +422,7 @@ msdos_stdcolor_name (int idx)
     return build_string (unspecified_fg);
   else if (idx == FACE_TTY_DEFAULT_BG_COLOR)
     return build_string (unspecified_bg);
-  else if (idx >= 0 && idx < sizeof (vga_colors) / sizeof (vga_colors[0]))
+  else if (idx >= 0 && idx < ARRAYELTS (vga_colors))
     return build_string (vga_colors[idx]);
   else
     return Qunspecified;       /* meaning the default */
@@ -471,18 +472,18 @@ x_set_title (struct frame *f, Lisp_Object name)
   if (EQ (name, f->title))
     return;
 
-  update_mode_lines = 1;
+  update_mode_lines = 13;
 
-  FSET (f, title, name);
+  fset_title (f, name);
 
   if (NILP (name))
     name = f->name;
 
   if (FRAME_MSDOS_P (f))
     {
-      BLOCK_INPUT;
+      block_input ();
       w95_set_virtual_machine_title (SDATA (name));
-      UNBLOCK_INPUT;
+      unblock_input ();
     }
 }
 #endif /* !HAVE_X_WINDOWS */
@@ -673,18 +674,7 @@ dos_cleanup (void)
 void
 syms_of_dosfns (void)
 {
-  defsubr (&Sint86);
-  defsubr (&Sdos_memget);
-  defsubr (&Sdos_memput);
-  defsubr (&Smsdos_mouse_init);
-  defsubr (&Smsdos_mouse_enable);
-  defsubr (&Smsdos_set_keyboard);
-  defsubr (&Sinsert_startup_screen);
-  defsubr (&Smsdos_mouse_disable);
-  defsubr (&Sfile_system_info);
-#ifndef HAVE_X_WINDOWS
-  defsubr (&Smsdos_mouse_p);
-#endif
+#include "dosfns.x"
 
   DEFVAR_INT ("dos-country-code", dos_country_code,
              doc: /* The country code returned by Dos when Emacs was started.