Mercurial > emacs
comparison src/coding.c @ 83159:38500c0c86ab
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398
Tweak permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399
Tweak directory permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401
More build-in-place tweaking of arch tagging
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403
Yet more build-in-place tweaking of arch tagging
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-405
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-406
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-407
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-199
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 14 Jun 2004 20:00:54 +0000 |
| parents | cf8f0a3b5cb4 32381d1c4eab |
| children | dbcd0af66869 |
comparison
equal
deleted
inserted
replaced
| 83158:f948c9fd910c | 83159:38500c0c86ab |
|---|---|
| 6314 consumed += coding->consumed; | 6314 consumed += coding->consumed; |
| 6315 consumed_char += coding->consumed_char; | 6315 consumed_char += coding->consumed_char; |
| 6316 produced += coding->produced; | 6316 produced += coding->produced; |
| 6317 produced_char += coding->produced_char; | 6317 produced_char += coding->produced_char; |
| 6318 if (result == CODING_FINISH_NORMAL | 6318 if (result == CODING_FINISH_NORMAL |
| 6319 || result == CODING_FINISH_INTERRUPT | |
| 6319 || (result == CODING_FINISH_INSUFFICIENT_SRC | 6320 || (result == CODING_FINISH_INSUFFICIENT_SRC |
| 6320 && coding->consumed == 0)) | 6321 && coding->consumed == 0)) |
| 6321 break; | 6322 break; |
| 6322 /* Now result should be CODING_FINISH_INSUFFICIENT_DST. */ | 6323 /* Now result should be CODING_FINISH_INSUFFICIENT_DST. */ |
| 6323 extend_conversion_buffer (&buf); | 6324 extend_conversion_buffer (&buf); |
