Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / dosfns.h

diff --git a/src/dosfns.h b/src/dosfns.h
index 61145c0ed217ee546b4991ba686d9827dab307ca..40aaf524e23e907c2409f8b91d17c545f351e774 100644 (file)
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -1,6 +1,9 @@
 /* MS-DOS specific Lisp utilities interface.
    Coded by Manabu Higashida, 1991.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Modified by Morten Welinder, 1993-1994.
+
+   Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -16,18 +19,18 @@ 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.  */
 
-extern int dos_hyper_key;
-extern int dos_super_key;
-extern int dos_decimal_point;
-extern int dos_keypad_mode;
+extern EMACS_INT dos_hyper_key;
+extern EMACS_INT dos_super_key;
+extern EMACS_INT dos_decimal_point;
+extern EMACS_INT dos_keypad_mode;
 
-extern int dos_keyboard_layout;
-extern int dos_country_code;
-extern int dos_codepage;
-extern int dos_timezone_offset;
+extern EMACS_INT dos_keyboard_layout;
+extern EMACS_INT dos_country_code;
+extern EMACS_INT dos_codepage;
+extern EMACS_INT dos_timezone_offset;
 
 #define DOS_COUNTRY_INFO 34    /* no of bytes returned by dos int 38h */
 extern unsigned char dos_country_info[DOS_COUNTRY_INFO];
@@ -36,8 +39,10 @@ extern Lisp_Object Vdos_version;
 extern Lisp_Object Vdos_windows_version;
 #ifndef HAVE_X_WINDOWS
 extern Lisp_Object Vdos_display_scancodes;
-extern Lisp_Object Qmsdos_color_translate;
 
 extern int         msdos_stdcolor_idx  P_ ((const char *));
-extern char       *msdos_stdcolor_name P_ ((int));
+extern Lisp_Object msdos_stdcolor_name P_ ((int));
 #endif
+
+/* arch-tag: a83b8c4c-63c8-451e-9e94-bc72e3e2f8bc
+   (do not change this comment) */