[Emacs-diffs] Changes to emacs/src/ccl.c

[Dave Love]

Index: emacs/src/ccl.c
diff -c emacs/src/ccl.c:1.79 emacs/src/ccl.c:1.80
*** emacs/src/ccl.c:1.79        Sun Jul 14 20:00:35 2002
--- emacs/src/ccl.c     Wed Jul 17 10:39:54 2002
***************
*** 20,44 ****
  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  Boston, MA 02111-1307, USA.  */
  
- #ifdef emacs
  #include <config.h>
- #endif
  
  #include <stdio.h>
  
- #ifdef emacs
- 
  #include "lisp.h"
  #include "charset.h"
  #include "ccl.h"
  #include "coding.h"
  
- #else  /* not emacs */
- 
- #include "mulelib.h"
- 
- #endif /* not emacs */
- 
  /* This contains all code conversion map available to CCL.  */
  Lisp_Object Vcode_conversion_map_vector;
  
--- 20,34 ----
***************
*** 862,868 ****
  
  #ifdef CCL_DEBUG
  #define CCL_DEBUG_BACKTRACE_LEN 256
! int ccl_backtrace_table[CCL_BACKTRACE_TABLE];
  int ccl_backtrace_idx;
  #endif
  
--- 852,858 ----
  
  #ifdef CCL_DEBUG
  #define CCL_DEBUG_BACKTRACE_LEN 256
! int ccl_backtrace_table[CCL_DEBUG_BACKTRACE_LEN];
  int ccl_backtrace_idx;
  #endif
  
***************
*** 1434,1443 ****
                op = hash_lookup (h, make_number (reg[RRR]), NULL);
                if (op >= 0)
                  {
!                   op = HASH_VALUE (h, op);
!                   if (!CHAR_VALID_P (op, 0))
                      CCL_INVALID_CMD;
!                   SPLIT_CHAR (XINT (op), reg[RRR], i, j);
                    if (j != -1)
                      i = (i << 7) | j;
                    reg[rrr] = i;
--- 1424,1434 ----
                op = hash_lookup (h, make_number (reg[RRR]), NULL);
                if (op >= 0)
                  {
!                   Lisp_Object opl;
!                   opl = HASH_VALUE (h, op);
!                   if (!CHAR_VALID_P (XINT (opl), 0))
                      CCL_INVALID_CMD;
!                   SPLIT_CHAR (XINT (opl), reg[RRR], i, j);
                    if (j != -1)
                      i = (i << 7) | j;
                    reg[rrr] = i;
***************
*** 1458,1467 ****
                op = hash_lookup (h, make_number (i), NULL);
                if (op >= 0)
                  {
!                   op = HASH_VALUE (h, op);
!                   if (!INTEGERP (op))
                      CCL_INVALID_CMD;
!                   reg[RRR] = XINT (op);
                    reg[7] = 1; /* r7 true for success */
                  }
                else
--- 1449,1459 ----
                op = hash_lookup (h, make_number (i), NULL);
                if (op >= 0)
                  {
!                   Lisp_Object opl;
!                   opl = HASH_VALUE (h, op);
!                   if (!INTEGERP (opl))
                      CCL_INVALID_CMD;
!                   reg[RRR] = XINT (opl);
                    reg[7] = 1; /* r7 true for success */
                  }
                else
***************
*** 2071,2078 ****
    return 0;
  }
  
- #ifdef emacs
- 
  DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
         doc: /* Return t if OBJECT is a CCL program name or a compiled CCL 
program code.
  See the documentation of  `define-ccl-program' for the detail of CCL program. 
 */)
--- 2063,2068 ----
***************
*** 2412,2416 ****
    defsubr (&Sregister_ccl_program);
    defsubr (&Sregister_code_conversion_map);
  }
- 
- #endif  /* emacs */
--- 2402,2404 ----