(Fcoordinates_in_window_p): Convert Fcons arguments to Lisp_Integer.

[gnu-emacs] / src / coding.h

diff --git a/src/coding.h b/src/coding.h
index 47777fddb94717710a53147fae77d7bd8fb805f6..7ac022e942d34d9a0625cfacde7fdc78f0091ce6 100644 (file)
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,7 +1,6 @@
 /* Header for coding system handler.
-   Ver.1.0
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+   Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
+   Licensed to the Free Software Foundation.
 
 This file is part of GNU Emacs.
 
@@ -149,7 +148,7 @@ struct iso2022_spec
   int initial_designation[4];
 
   /* A graphic register to which each charset should be designated.  */
-  char requested_designation[MAX_CHARSET + 1];
+  unsigned char requested_designation[MAX_CHARSET + 1];
 
   /* Set to 1 temporarily only when graphic register 2 or 3 is invoked
      by single-shift while encoding.  */
@@ -173,6 +172,12 @@ struct iso2022_spec
 #define CODING_SPEC_ISO_BOL(coding) \
   coding->spec.iso2022.bol
 
+/* A value which may appear in
+   coding->spec.iso2022.requested_designation indicating that the
+   corresponding charset does not request any graphic register to be
+   designated.  */
+#define CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION 4
+
 /* Return a charset which is currently designated to the graphic plane
    PLANE in the coding-system CODING.  */
 #define CODING_SPEC_ISO_PLANE_CHARSET(coding, plane)   \
@@ -290,8 +295,9 @@ struct coding_system
      additional conversion. */
   Lisp_Object pre_write_conversion;
 
-  /* Character unification table to look up, or nil.  */
-  Lisp_Object character_unification_table;
+  /* Character unification tables to look up, or nil.  */
+  Lisp_Object character_unification_table_for_decode;
+  Lisp_Object character_unification_table_for_encode;
 
   /* Carryover yielded by decoding/encoding incomplete source.  No
      coding-system yields more than 7-byte of carryover.  This does
@@ -384,6 +390,7 @@ extern int conversion_buffer_size;
 extern char *conversion_buffer, *get_conversion_buffer ();
 extern Lisp_Object Fcheck_coding_system ();
 extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index;
+extern Lisp_Object Qemacs_mule;
 extern Lisp_Object Qbuffer_file_coding_system;
 extern Lisp_Object Vcoding_category_list;
 
@@ -419,7 +426,8 @@ extern struct coding_system terminal_coding;
    function `set-keyboard-coding-system'.  */
 extern struct coding_system keyboard_coding;
 
-extern Lisp_Object Vcoding_system_alist;
+/* Default coding systems used for process I/O.  */
+extern Lisp_Object Vdefault_process_coding_system;
 
 #endif