modified.

[elisp/apel.git] / pccl-om.el

diff --git a/pccl-om.el b/pccl-om.el
index 40e2080..9f9a26f 100644 (file)
--- a/pccl-om.el
+++ b/pccl-om.el
@@ -1,10 +1,10 @@
-;;; pccl-om.el --- Portable CCL utility for Mule 1.* and Mule 2.*
+;;; pccl-om.el --- Portable CCL utility for Mule 2.*
 
 ;; Copyright (C) 1998 Free Software Foundation, Inc.
 ;; Copyright (C) 1998 Tanaka Akira
 
 ;; Author: Tanaka Akira <akr@jaist.ac.jp>
-;;         Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
+;;     Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: emulation, compatibility, Mule
 
 ;; This file is part of APEL (A Portable Emacs Library).
@@ -21,13 +21,11 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
-(require 'poem)
-
 (eval-when-compile (require 'ccl))
 (require 'broken)
 
@@ -50,16 +48,14 @@ CODING-SYSTEM, DECODER and ENCODER must be symbol."
 
 (defun ccl-execute (ccl-prog reg)
   "Execute CCL-PROG with registers initialized by REGISTERS.
-If CCL-PROG is symbol, it is dereferenced.
-\[Emacs 20.3 emulating function]"
+If CCL-PROG is symbol, it is dereferenced."
   (exec-ccl
    (if (symbolp ccl-prog) (symbol-value ccl-prog) ccl-prog)
    reg))
 
 (defun ccl-execute-on-string (ccl-prog status string &optional contin)
   "Execute CCL-PROG with initial STATUS on STRING.
-If CCL-PROG is symbol, it is dereferenced.
-\[Emacs 20.3 emulating function]"
+If CCL-PROG is symbol, it is dereferenced."
   (exec-ccl-string
    (if (symbolp ccl-prog) (symbol-value ccl-prog) ccl-prog)
    status string))
@@ -82,19 +78,19 @@ If CCL-PROG is symbol, it is dereferenced.
 
 (broken-facility ccl-execute-eof-block-on-encoding-null
   "Emacs forgets executing CCL_EOF_BLOCK with encoding on empty input."
-  (equal (encode-coding-string "" 'test-ccl-eof-block-cs) "[EOF]"))
+  (equal (code-convert-string "" *internal* 'test-ccl-eof-block-cs) "[EOF]"))
 
 (broken-facility ccl-execute-eof-block-on-encoding-some
   "Emacs forgets executing CCL_EOF_BLOCK with encoding on non-empty input."
-  (equal (encode-coding-string "a" 'test-ccl-eof-block-cs) "a[EOF]"))
+  (equal (code-convert-string "a" *internal* 'test-ccl-eof-block-cs) "a[EOF]"))
 
 (broken-facility ccl-execute-eof-block-on-decoding-null
   "Emacs forgets executing CCL_EOF_BLOCK with decoding on empty input."
-  (equal (decode-coding-string "" 'test-ccl-eof-block-cs) "[EOF]"))
+  (equal (code-convert-string "" 'test-ccl-eof-block-cs *internal*) "[EOF]"))
 
 (broken-facility ccl-execute-eof-block-on-decoding-some
   "Emacs forgets executing CCL_EOF_BLOCK with decoding on non-empty input."
-  (equal (decode-coding-string "a" 'test-ccl-eof-block-cs) "a[EOF]"))
+  (equal (code-convert-string "a" 'test-ccl-eof-block-cs *internal*) "a[EOF]"))
 
 (broken-facility ccl-execute-eof-block-on-encoding
   "Emacs may forget executing CCL_EOF_BLOCK with encoding."
@@ -114,10 +110,20 @@ If CCL-PROG is symbol, it is dereferenced.
           (broken-p 'ccl-execute-eof-block-on-decoding)))
   t)
 
+(broken-facility ccl-cascading-read
+  "Emacs CCL read command does not accept more than 2 arguments."
+  (condition-case nil
+      (progn
+        (define-ccl-program cascading-read-test
+          '(1
+            (read r0 r1 r2)))
+        t)
+    (error nil)))
 
 ;;; @ end
 ;;;
 
-(provide 'pccl-om)
+(require 'product)
+(product-provide (provide 'pccl-om) (require 'apel-ver))
 
 ;;; pccl-om.el ends here