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

[Ken Raeburn]

Index: emacs/src/bytecode.c
diff -c emacs/src/bytecode.c:1.70 emacs/src/bytecode.c:1.71
*** emacs/src/bytecode.c:1.70   Thu Jul 11 10:08:30 2002
--- emacs/src/bytecode.c        Sun Jul 14 20:00:35 2002
***************
*** 327,336 ****
        XUNMARK (stack->byte_string);
        XUNMARK (stack->constants);
  
!       if (stack->byte_string_start != XSTRING (stack->byte_string)->data)
        {
          int offset = stack->pc - stack->byte_string_start;
!         stack->byte_string_start = XSTRING (stack->byte_string)->data;
          stack->pc = stack->byte_string_start + offset;
        }
      }
--- 327,336 ----
        XUNMARK (stack->byte_string);
        XUNMARK (stack->constants);
  
!       if (stack->byte_string_start != SDATA (stack->byte_string))
        {
          int offset = stack->pc - stack->byte_string_start;
!         stack->byte_string_start = SDATA (stack->byte_string);
          stack->pc = stack->byte_string_start + offset;
        }
      }
***************
*** 460,470 ****
         convert them back to the originally intended unibyte form.  */
      bytestr = Fstring_as_unibyte (bytestr);
  
!   bytestr_length = STRING_BYTES (XSTRING (bytestr));
    vectorp = XVECTOR (vector)->contents;
  
    stack.byte_string = bytestr;
!   stack.pc = stack.byte_string_start = XSTRING (bytestr)->data;
    stack.constants = vector;
    stack.bottom = (Lisp_Object *) alloca (XFASTINT (maxdepth)
                                           * sizeof (Lisp_Object));
--- 460,470 ----
         convert them back to the originally intended unibyte form.  */
      bytestr = Fstring_as_unibyte (bytestr);
  
!   bytestr_length = SBYTES (bytestr);
    vectorp = XVECTOR (vector)->contents;
  
    stack.byte_string = bytestr;
!   stack.pc = stack.byte_string_start = SDATA (bytestr);
    stack.constants = vector;
    stack.bottom = (Lisp_Object *) alloca (XFASTINT (maxdepth)
                                           * sizeof (Lisp_Object));
***************
*** 896,902 ****
        case Btemp_output_buffer_setup:
          BEFORE_POTENTIAL_GC ();
          CHECK_STRING (TOP);
!         temp_output_buffer_setup (XSTRING (TOP)->data);
          AFTER_POTENTIAL_GC ();
          TOP = Vstandard_output;
          break;
--- 896,902 ----
        case Btemp_output_buffer_setup:
          BEFORE_POTENTIAL_GC ();
          CHECK_STRING (TOP);
!         temp_output_buffer_setup (SDATA (TOP));
          AFTER_POTENTIAL_GC ();
          TOP = Vstandard_output;
          break;