Include coding.h and termhooks.h.

[bpt/emacs.git] / src / ccl.h

diff --git a/src/ccl.h b/src/ccl.h
index e1c14e7..8c4df35 100644 (file)
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -1,6 +1,6 @@
 /* Header for CCL (Code Conversion Language) interpreter.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 /* Header for CCL (Code Conversion Language) interpreter.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-     2005, 2006, 2007
+     2005, 2006, 2007, 2008, 2009

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003


@@ -9,10 +9,10 @@
 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 

-GNU Emacs is free software; you can redistribute it and/or modify
+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
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -20,9 +20,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+

 
 #ifndef EMACS_CCL_H
 #define EMACS_CCL_H
 
 #ifndef EMACS_CCL_H
 #define EMACS_CCL_H


@@ -77,6 +76,9 @@ struct ccl_program {
                                   CCL_WRITE_CHAR.  After execution,
                                   if no such byte is written, set
                                   this value to zero.  */
                                   CCL_WRITE_CHAR.  After execution,
                                   if no such byte is written, set
                                   this value to zero.  */

+  int quit_silently;           /* If nonzero, don't append "CCL:
+                                  Quitted" to the generated text when
+                                  CCL program is quitted. */

 };
 
 /* This data type is used for the spec field of the structure
 };
 
 /* This data type is used for the spec field of the structure


@@ -117,7 +119,7 @@ EXFUN (Fccl_program_p, 1);
 #define CHECK_CCL_PROGRAM(x)                   \
   do {                                         \
     if (NILP (Fccl_program_p (x)))             \
 #define CHECK_CCL_PROGRAM(x)                   \
   do {                                         \
     if (NILP (Fccl_program_p (x)))             \

-      x = wrong_type_argument (Qcclp, (x));    \
+      wrong_type_argument (Qcclp, (x));        \

   } while (0);
 
 #endif /* EMACS_CCL_H */
   } while (0);
 
 #endif /* EMACS_CCL_H */