comparison src/coding.c @ 83310:e58cb448e07c

Merged from [e-mail]--gnu-2005 (patch 80-82, 350-422) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-350 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-351 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-352 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-353 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-354 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-355 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-356 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-357 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-358 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-359 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-360 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-361 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-362 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-363 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-364 Remove "-face" suffix from widget faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-365 Remove "-face" suffix from custom faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-366 Remove "-face" suffix from change-log faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-367 Remove "-face" suffix from compilation faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-368 Remove "-face" suffix from diff-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-369 lisp/longlines.el (longlines-visible-face): Face removed * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-370 Remove "-face" suffix from woman faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-371 Remove "-face" suffix from whitespace-highlight face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-372 Remove "-face" suffix from ruler-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-373 Remove "-face" suffix from show-paren faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-374 Remove "-face" suffix from log-view faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-375 Remove "-face" suffix from smerge faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-376 Remove "-face" suffix from show-tabs faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-377 Remove "-face" suffix from highlight-changes faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-378 Remove "-face" suffix from and downcase info faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-379 Remove "-face" suffix from pcvs faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-380 Update uses of renamed pcvs faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-381 Tweak ChangeLog * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-382 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-383 Remove "-face" suffix from strokes-char face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-384 Remove "-face" suffix from compare-windows face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-385 Remove "-face" suffix from calendar faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-386 Remove "-face" suffix from diary-button face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-387 Remove "-face" suffix from testcover faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-388 Remove "-face" suffix from viper faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-389 Remove "-face" suffix from org faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-390 Remove "-face" suffix from sgml-namespace face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-391 Remove "-face" suffix from table-cell face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-392 Remove "-face" suffix from tex-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-393 Remove "-face" suffix from texinfo-heading face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-394 Remove "-face" suffix from flyspell faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-395 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-396 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-397 Remove "-face" suffix from gomoku faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-398 Remove "-face" suffix from mpuz faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-399 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-400 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-401 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-402 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-403 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-404 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-405 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-406 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-407 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-408 Remove "-face" suffix from Buffer-menu-buffer face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-409 Remove "-face" suffix from antlr-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-410 Remove "-face" suffix from ebrowse faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-411 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-412 Remove "-face" suffix from flymake faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-413 Remove "-face" suffix from idlwave faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-414 Remove "-face" suffix from sh-script faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-415 Remove "-face" suffix from vhdl-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-416 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-417 Remove "-face" suffix from which-func face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-418 Remove "-face" suffix from cperl-mode faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-419 Remove "-face" suffix from ld-script faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-420 Fix cperl-mode font-lock problem * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-421 Tweak which-func face * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-422 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-80 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-81 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-82 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-350

83309:6aee1e9b0bd7

     int encodep;
{
  int count = SPECPDL_INDEX ();
  struct gcpro gcpro1, gcpro2;
  int multibyte = STRING_MULTIBYTE (str);
  struct buffer *buf;
  Lisp_Object old_deactivate_mark;

  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
  record_unwind_protect (code_convert_region_unwind,
			 Vlast_coding_system_used);

      consumed += coding->consumed;
      consumed_char += coding->consumed_char;
      produced += coding->produced;
      produced_char += coding->produced_char;
      if (result == CODING_FINISH_NORMAL
	  || (result == CODING_FINISH_INSUFFICIENT_SRC
	      && coding->consumed == 0))
	break;
      if (result == CODING_FINISH_INSUFFICIENT_CMP)
	coding_allocate_composition_data (coding, from + produced_char);

83310:e58cb448e07c

     int encodep;
{
  int count = SPECPDL_INDEX ();
  struct gcpro gcpro1, gcpro2;
  int multibyte = STRING_MULTIBYTE (str);
  Lisp_Object old_deactivate_mark;

  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
  record_unwind_protect (code_convert_region_unwind,
			 Vlast_coding_system_used);

      consumed += coding->consumed;
      consumed_char += coding->consumed_char;
      produced += coding->produced;
      produced_char += coding->produced_char;
      if (result == CODING_FINISH_NORMAL
	  || result == CODING_FINISH_INTERRUPT
	  || (result == CODING_FINISH_INSUFFICIENT_SRC
	      && coding->consumed == 0))
	break;
      if (result == CODING_FINISH_INSUFFICIENT_CMP)
	coding_allocate_composition_data (coding, from + produced_char);