Fix Myanmar OTF support

[gnu-emacs] / lisp / international / ccl.el

diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index e1fb658f8606c9dd4da30eb69da2e8cffb6b9f91..09510cd8b00120674821aed4381d25b72b0ff4da 100644 (file)
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1,9 +1,9 @@
 ;;; ccl.el --- CCL (Code Conversion Language) compiler
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008  Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008
+;;   2005, 2006, 2007, 2008, 2009, 2010
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -505,6 +505,8 @@ If READ-FLAG is non-nil, this statement has the form
            (op (get (nth 1 condition) 'ccl-arith-code))
            (arg (nth 2 condition)))
        (ccl-check-register rrr cmd)
+       (or (integerp op)
+           (error "CCL: invalid operator: %s" (nth 1 condition)))
        (if (integerp arg)
            (progn
              (ccl-embed-code (if read-flag 'read-jump-cond-expr-const
@@ -1514,6 +1516,7 @@ MAP-IDs := MAP-ID ...
 MAP-SET := MAP-IDs | (MAP-IDs) MAP-SET
 MAP-ID := integer
 "
+  (declare (doc-string 3))
   `(let ((prog ,(unwind-protect
                    (progn
                      ;; To make ,(charset-id CHARSET) works well.