Fix arg usage of format-decode-run-method (Bug#7488).

[bpt/emacs.git] / lisp / international / ccl.el

diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 5137a66..4dc5485 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
 
@@ -11,10 +11,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,9 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -507,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
@@ -1437,7 +1437,7 @@ OPERATOR :=
        ;; Normal arithmethic operators (same meaning as C code).
        + | - | * | / | %
 
-       ;; Bitwize operators (same meaning as C code)
+       ;; Bitwise operators (same meaning as C code)
        | & | `|' | ^
 
        ;; Shifting operators (same meaning as C code)
@@ -1516,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.