[Emacs-diffs] Changes to emacs/src/coding.c [emacs-unicode-2]

[Dave Love]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.289.2.2 emacs/src/coding.c:1.289.2.3
*** emacs/src/coding.c:1.289.2.2        Wed Sep 17 15:21:10 2003
--- emacs/src/coding.c  Mon Sep 29 13:59:52 2003
***************
*** 401,412 ****
  /* Char table for translating Quail and self-inserting input.  */
  Lisp_Object Vtranslation_table_for_input;
  
- /* Global flag to tell that we can't call post-read-conversion and
-    pre-write-conversion functions.  Usually the value is zero, but it
-    is set to 1 temporarily while such functions are running.  This is
-    to avoid infinite recursive call.  */
- static int inhibit_pre_post_conversion;
- 
  /* Two special coding systems.  */
  Lisp_Object Vsjis_coding_system;
  Lisp_Object Vbig5_coding_system;
--- 401,406 ----
***************
*** 972,978 ****
  static unsigned char *
  alloc_destination (coding, nbytes, dst)
       struct coding_system *coding;
!      int nbytes;
       unsigned char *dst;
  {
    EMACS_INT offset = dst - coding->destination;
--- 966,972 ----
  static unsigned char *
  alloc_destination (coding, nbytes, dst)
       struct coding_system *coding;
!      EMACS_INT nbytes;
       unsigned char *dst;
  {
    EMACS_INT offset = dst - coding->destination;
***************
*** 5018,5029 ****
  coding_inherit_eol_type (coding_system, parent)
       Lisp_Object coding_system, parent;
  {
!   Lisp_Object spec, attrs, eol_type;
  
    if (NILP (coding_system))
      coding_system = Qraw_text;
    spec = CODING_SYSTEM_SPEC (coding_system);
-   attrs = AREF (spec, 0);
    eol_type = AREF (spec, 2);
    if (VECTORP (eol_type)
        && ! NILP (parent))
--- 5012,5022 ----
  coding_inherit_eol_type (coding_system, parent)
       Lisp_Object coding_system, parent;
  {
!   Lisp_Object spec, eol_type;
  
    if (NILP (coding_system))
      coding_system = Qraw_text;
    spec = CODING_SYSTEM_SPEC (coding_system);
    eol_type = AREF (spec, 2);
    if (VECTORP (eol_type)
        && ! NILP (parent))
***************
*** 5371,5377 ****
        && ! EQ (coding_type, Qccl))
      {
        int eol_seen = detect_eol (coding->source, coding->src_bytes,
!                                XINT (CODING_ATTR_CATEGORY (attrs)));
  
        if (eol_seen != EOL_SEEN_NONE)
        adjust_coding_eol_type (coding, eol_seen);
--- 5364,5370 ----
        && ! EQ (coding_type, Qccl))
      {
        int eol_seen = detect_eol (coding->source, coding->src_bytes,
!                                (enum coding_category) XINT 
(CODING_ATTR_CATEGORY (attrs)));
  
        if (eol_seen != EOL_SEEN_NONE)
        adjust_coding_eol_type (coding, eol_seen);
***************
*** 5477,5484 ****
    if (! coding->chars_at_source)
      {
        /* Characters are in coding->charbuf.  */
!       int *buf = coding->charbuf;
!       int *buf_end = buf + coding->charbuf_used;
        unsigned char *adjusted_dst_end;
  
        if (BUFFERP (coding->src_object)
--- 5470,5477 ----
    if (! coding->chars_at_source)
      {
        /* Characters are in coding->charbuf.  */
!       EMACS_INT *buf = coding->charbuf;
!       EMACS_INT *buf_end = buf + coding->charbuf_used;
        unsigned char *adjusted_dst_end;
  
        if (BUFFERP (coding->src_object)
***************
*** 8636,8643 ****
    iso_code_class[ISO_CODE_SS2] = ISO_single_shift_2;
    iso_code_class[ISO_CODE_SS3] = ISO_single_shift_3;
    iso_code_class[ISO_CODE_CSI] = ISO_control_sequence_introducer;
- 
-   inhibit_pre_post_conversion = 0;
  
    for (i = 0; i < 256; i++)
      {
--- 8629,8634 ----