Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 485-492)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 92-94)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

1 files changed, 5 insertions, 4 deletions

diff --git a/src/ccl.c b/src/ccl.c
index 6359e947d27..e827ed7f28d 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2030,7 +2030,7 @@ DEFUN ("ccl-execute-on-string", Fccl_execute_on_string, Sccl_execute_on_string,
        3, 5, 0,
        doc: /* Execute CCL-PROGRAM with initial STATUS on STRING.
 
-CCL-PROGRAM is a symbol registered by register-ccl-program,
+CCL-PROGRAM is a symbol registered by `register-ccl-program',
 or a compiled code generated by `ccl-compile' (for backward compatibility,
 in this case, the execution is slower).
 
@@ -2051,7 +2051,8 @@ It returns the contents of write buffer as a string,
 If the optional 5th arg UNIBYTE-P is non-nil, the returned string
 is a unibyte string.  By default it is a multibyte string.
 
-See the documentation of `define-ccl-program' for the detail of CCL program.  */)
+See the documentation of `define-ccl-program' for the detail of CCL program.
+usage: (ccl-execute-on-string CCL-PROGRAM STATUS STRING &optional CONTINUE UNIBYTE-P)  */)
      (ccl_prog, status, str, contin, unibyte_p)
      Lisp_Object ccl_prog, status, str, contin, unibyte_p;
 {
@@ -2177,8 +2178,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program.  */
 
 DEFUN ("register-ccl-program", Fregister_ccl_program, Sregister_ccl_program,
        2, 2, 0,
-       doc: /* Register CCL program CCL_PROG as NAME in `ccl-program-table'.
-CCL_PROG should be a compiled CCL program (vector), or nil.
+       doc: /* Register CCL program CCL-PROG as NAME in `ccl-program-table'.
+CCL-PROG should be a compiled CCL program (vector), or nil.
 If it is nil, just reserve NAME as a CCL program name.
 Return index number of the registered CCL program.  */)
      (name, ccl_prog)