Merge from emacs--rel--22

[gnu-emacs] / src / coding.h

diff --git a/src/coding.h b/src/coding.h
index 54553a071fa178e2742e622152a8c6fa7af506e9..a08bbb8d9668eaaa1c4cb9c39f996625b46474c1 100644 (file)
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,7 +1,8 @@
 /* Header for coding system handler.
-   Copyright (C) 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1997, 1998, 2000
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+     2005, 2006, 2007, 2008
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
@@ -9,7 +10,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -262,7 +263,7 @@ enum coding_type
                                     eol-type is not consistent
                                     through the file.  */
 
-/* 1 iff composing.  */
+/* 1 if composing.  */
 #define COMPOSING_P(coding) ((int) coding->composing > (int) COMPOSITION_NO)
 
 #define COMPOSITION_DATA_SIZE 4080
@@ -371,7 +372,7 @@ struct coding_system
   /* The current status of composition handling.  */
   int composing;
 
-  /* 1 iff the next character is a composition rule.  */
+  /* 1 if the next character is a composition rule.  */
   int composition_rule_follows;
 
   /* Information of compositions are stored here on decoding and set
@@ -462,7 +463,10 @@ struct coding_system
    || (coding)->common_flags & CODING_REQUIRE_DECODING_MASK)
 
 /* Return 1 if the coding system CODING requires code conversion on
-   encoding.  */
+   encoding.
+   The non-multibyte part of the condition is to support encoding of
+   unibyte strings/buffers generated by string-as-unibyte or
+   (set-buffer-multibyte nil) from multibyte strings/buffers.  */
 #define CODING_REQUIRE_ENCODING(coding)        \
   ((coding)->src_multibyte             \
    || (coding)->common_flags & CODING_REQUIRE_ENCODING_MASK)
@@ -692,20 +696,10 @@ extern Lisp_Object Vlocale_coding_system;
    the subprocess output.  */
 extern int inherit_process_coding_system;
 
-/* Coding-system to be used for encoding terminal output.  This
-   structure contains information of a coding-system specified by the
-   function `set-terminal-coding-system'.  */
-extern struct coding_system terminal_coding;
-
 /* Coding system to be used to encode text for terminal display when
    terminal coding system is nil.  */
 extern struct coding_system safe_terminal_coding;
 
-/* Coding-system of what is sent from terminal keyboard.  This
-   structure contains information of a coding-system specified by the
-   function `set-keyboard-coding-system'.  */
-extern struct coding_system keyboard_coding;
-
 /* Default coding system to be used to write a file.  */
 extern struct coding_system default_buffer_file_coding;