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

[Miles Bader]

Index: emacs/src/term.c
diff -c emacs/src/term.c:1.146.4.5 emacs/src/term.c:1.146.4.6
*** emacs/src/term.c:1.146.4.5  Fri Apr 16 12:50:50 2004
--- emacs/src/term.c    Wed Dec  8 05:02:19 2004
***************
*** 954,962 ****
  
    cmplus (len);
  
    /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at
       the tail.  */
!   terminal_coding.mode &= ~CODING_MODE_LAST_BLOCK;
  
    while (len > 0)
      {
--- 954,967 ----
  
    cmplus (len);
  
+   /* If terminal_coding does any conversion, use it, otherwise use
+      safe_terminal_coding.  We can't use CODING_REQUIRE_ENCODING here
+      because it always return 1 if the member src_multibyte is 1.  */
+   coding = (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK
+           ? &terminal_coding : &safe_terminal_coding);
    /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at
       the tail.  */
!   coding->mode &= ~CODING_MODE_LAST_BLOCK;
  
    while (len > 0)
      {
***************
*** 1006,1011 ****
--- 1011,1019 ----
    char *buf;
    struct glyph *glyph = NULL;
    struct frame *f, *sf;
+   unsigned char *conversion_buffer;
+   unsigned char space[1];
+   struct coding_system *coding;
  
    if (len <= 0)
      return;
***************
*** 2239,2244 ****
--- 2247,2254 ----
    int status;
    struct frame *sf = XFRAME (selected_frame);
  
+   encode_terminal_bufsize = 0;
+ 
  #ifdef WINDOWSNT
    initialize_w32_display ();