Merge from emacs--rel--22

[gnu-emacs] / src / ccl.h

diff --git a/src/ccl.h b/src/ccl.h
index 3afb135fb56f37a36d22c0a249a8dbd8329fb964..18c6ae1ebc7f0160fda27be2eb86e136eada9d34 100644 (file)
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -77,6 +77,9 @@ struct ccl_program {
                                   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
@@ -117,7 +120,7 @@ EXFUN (Fccl_program_p, 1);
 #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 */