(wakeup_from_rne_enabled_p) [MAC_OSX]: Remove variable.

[bpt/emacs.git] / src / ccl.c

diff --git a/src/ccl.c b/src/ccl.c
index 9fb097d..564fd4b 100644 (file)
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1,13 +1,16 @@
 /* CCL (Code Conversion Language) interpreter.
-   Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-   Licensed to the Free Software Foundation.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+     2005, 2006, 2007
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
 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 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -656,13 +659,13 @@ while (0)
 
 #define CCL_LookupIntConstTbl 0x13 /* Lookup multibyte character by
                                      integer key.  Afterwards R7 set
-                                     to 1 iff lookup succeeded.
+                                     to 1 if lookup succeeded.
                                      1:ExtendedCOMMNDRrrRRRXXXXXXXX
                                      2:ARGUMENT(Hash table ID) */
 
 #define CCL_LookupCharConstTbl 0x14 /* Lookup integer by multibyte
                                       character key.  Afterwards R7 set
-                                      to 1 iff lookup succeeded.
+                                      to 1 if lookup succeeded.
                                       1:ExtendedCOMMNDRrrRRRrrrXXXXX
                                       2:ARGUMENT(Hash table ID) */
 
@@ -1258,7 +1261,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed)
            case CCL_MOD: reg[rrr] = i % j; break;
            case CCL_AND: reg[rrr] = i & j; break;
            case CCL_OR: reg[rrr] = i | j; break;
-           case CCL_XOR: reg[rrr] = i ^ j;; break;
+           case CCL_XOR: reg[rrr] = i ^ j; break;
            case CCL_LSH: reg[rrr] = i << j; break;
            case CCL_RSH: reg[rrr] = i >> j; break;
            case CCL_LSH8: reg[rrr] = (i << 8) | j; break;
@@ -2119,7 +2122,6 @@ int
 check_ccl_update (ccl)
      struct ccl_program *ccl;
 {
-  struct Lisp_Vector *vp;
   Lisp_Object slot, ccl_prog;
 
   if (ccl->idx < 0)