--- a/lisp/mule/ccl.el	Tue Feb 22 22:56:02 2011 +0100
+++ b/lisp/mule/ccl.el	Thu Mar 17 23:42:59 2011 +0100
@@ -471,7 +471,7 @@
 ;; If READ-FLAG is non-nil, this statement has the form
 ;; `(read-if (REG OPERATOR ARG) TRUE-PART FALSE-PART)'.
 (defun ccl-compile-if (cmd &optional read-flag)
-  (if (and (/= (length cmd) 3) (/= (length cmd) 4))
+  (if (and (not (<= 3 (length cmd) 4)))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((condition (nth 1 cmd))
 	(true-cmds (nth 2 cmd))
@@ -644,7 +644,7 @@
 
 ;; Compile BREAK statement.
 (defun ccl-compile-break (cmd)
-  (if (/= (length cmd) 1)
+  (if (not (eql (length cmd) 1))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (null ccl-loop-head)
       (error "CCL: No outer loop: %s" cmd))
@@ -654,7 +654,7 @@
 
 ;; Compile REPEAT statement.
 (defun ccl-compile-repeat (cmd)
-  (if (/= (length cmd) 1)
+  (if (not (eql (length cmd) 1))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (null ccl-loop-head)
       (error "CCL: No outer loop: %s" cmd))
@@ -663,7 +663,7 @@
 
 ;; Compile WRITE-REPEAT statement.
 (defun ccl-compile-write-repeat (cmd)
-  (if (/= (length cmd) 2)
+  (if (not (eql (length cmd) 2))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (null ccl-loop-head)
       (error "CCL: No outer loop: %s" cmd))
@@ -781,7 +781,7 @@
 
 ;; Compile CALL statement.
 (defun ccl-compile-call (cmd)
-  (if (/= (length cmd) 2)
+  (if (not (eql (length cmd) 2))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (not (symbolp (nth 1 cmd)))
       (error "CCL: Subroutine should be a symbol: %s" cmd))
@@ -791,14 +791,14 @@
 
 ;; Compile END statement.
 (defun ccl-compile-end (cmd)
-  (if (/= (length cmd) 1)
+  (if (not (eql (length cmd) 1))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (ccl-embed-code 'end 0 0)
   t)
 
 ;; Compile read-multibyte-character
 (defun ccl-compile-read-multibyte-character (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd)))
@@ -809,7 +809,7 @@
 
 ;; Compile write-multibyte-character
 (defun ccl-compile-write-multibyte-character (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd)))
@@ -820,7 +820,7 @@
 
 ;; Compile translate-character
 (defun ccl-compile-translate-character (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((Rrr (nth 1 cmd))
 	(RRR (nth 2 cmd))
@@ -838,7 +838,7 @@
 
 ;; Compile mule-to-unicode
 (defun ccl-compile-mule-to-unicode (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd)))
@@ -850,7 +850,7 @@
 ;; Given a Unicode code point in register rrr, write the charset ID of the
 ;; corresponding character in RRR, and the Mule-CCL form of its code in rrr.
 (defun ccl-compile-unicode-to-mule (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((rrr (nth 1 cmd))
 	(RRR (nth 2 cmd)))
@@ -861,7 +861,7 @@
 
 ;; Compile lookup-integer
 (defun ccl-compile-lookup-integer (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((Rrr (nth 1 cmd))
 	(RRR (nth 2 cmd))
@@ -881,7 +881,7 @@
 
 ;; Compile lookup-character
 (defun ccl-compile-lookup-character (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((Rrr (nth 1 cmd))
 	(RRR (nth 2 cmd))
@@ -904,7 +904,7 @@
   nil)
 
 (defun ccl-compile-map-multiple (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let (func arg)
     (setq func
@@ -930,7 +930,7 @@
   nil)
 
 (defun ccl-compile-map-single (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd))
@@ -1560,4 +1560,4 @@
 
 (provide 'ccl)
 
-;; ccl.el ends her
+;; ccl.el ends here