diff options
| author | Karoly Lorentey | 2004-06-14 20:00:54 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-06-14 20:00:54 +0000 |
| commit | 987a34896f0f07c76a87314ee444467903632aeb (patch) | |
| tree | 5e982f524d8a38b1156fd5c7c93517170a4e6764 /src/coding.c | |
| parent | 71a96040ef5a4a8a308a109c45bbabb20769beac (diff) | |
| parent | 4060d762b6bd7a2e7e6d0c57154beac00496c9d6 (diff) | |
| download | emacs-987a34896f0f07c76a87314ee444467903632aeb.tar.gz emacs-987a34896f0f07c76a87314ee444467903632aeb.zip | |
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
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/coding.c b/src/coding.c index 328507de499..ed4b131b3a9 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -6316,6 +6316,7 @@ encode_coding_string (str, coding, nocopy) | |||
| 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; |