comparison src/term.c @ 24263:e81f007b15fa

(encode_terminal_code): Fix previous change.

24262:1c515a6c0686

  unsigned int c;
  unsigned char workbuf[4], *buf;
  int len;
  register int tlen = GLYPH_TABLE_LENGTH;
  register Lisp_Object *tbase = GLYPH_TABLE_BASE;
  struct coding_system *coding;

  coding = (CODING_REQUIRE_ENCODING (&terminal_coding)
	    ? &terminal_coding
	    : &safe_terminal_coding);

	      /* We have a string in Vglyph_table.  */
	      len = GLYPH_LENGTH (tbase, g);
	      buf = GLYPH_STRING (tbase, g);
	    }
	  
	  encode_coding (coding, buf, dst, len, dst_end - dst);
	  len -= coding->consumed;
	  dst += coding->produced;
	  if (len > 0)
	    {
	      if (len > dst_end - dst)
		/* The remaining output buffer is too short.  We must
		   break the loop here without increasing SRC so that
		   the next call of this function start from the same
		   glyph.  */
		break;
	      buf += len;
	      while (len--) *dst++ = *buf++;
	    }
	}
      src++;
    }
  *consumed = src - src_start;

24263:e81f007b15fa

  unsigned int c;
  unsigned char workbuf[4], *buf;
  int len;
  register int tlen = GLYPH_TABLE_LENGTH;
  register Lisp_Object *tbase = GLYPH_TABLE_BASE;
  int result;
  struct coding_system *coding;

  coding = (CODING_REQUIRE_ENCODING (&terminal_coding)
	    ? &terminal_coding
	    : &safe_terminal_coding);

	      /* We have a string in Vglyph_table.  */
	      len = GLYPH_LENGTH (tbase, g);
	      buf = GLYPH_STRING (tbase, g);
	    }
	  
	  result = encode_coding (coding, buf, dst, len, dst_end - dst);
	  len -= coding->consumed;
	  dst += coding->produced;
	  if (result == CODING_FINISH_INSUFFICIENT_DST
	      || (result == CODING_FINISH_INSUFFICIENT_SRC
		  && len > dst_end - dst))
	    /* The remaining output buffer is too short.  We must
	       break the loop here without increasing SRC so that the
	       next call of this function starts from the same glyph.  */
	    break;

	  if (len > 0)
	    {
	      /* This is the case that a code of the range 0200..0237
		 exists in buf.  We must just write out such a code.  */
	      buf += coding->consumed;
	      while (len--)
		*dst++ = *buf++;
	    }
	}
      src++;
    }
  *consumed = src - src_start;