diff options
| author | Kenichi Handa | 2000-02-02 06:58:58 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2000-02-02 06:58:58 +0000 |
| commit | ca91fb26ce839448e5bf939497ba6a9dd0390a2c (patch) | |
| tree | 4ce1308d87829963a57b3eaa5b40be0aa930db55 /src | |
| parent | 5eea385d29baf49c0af84aaaca9bb5c4db298424 (diff) | |
| download | emacs-ca91fb26ce839448e5bf939497ba6a9dd0390a2c.tar.gz emacs-ca91fb26ce839448e5bf939497ba6a9dd0390a2c.zip | |
(e_write): Fix the handling of
CODING_FINISH_INSUFFICIENT_SRC.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4f84dbba9c5..dbf0522b392 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-02-02 Kenichi Handa <handa@etl.go.jp> | ||
| 2 | |||
| 3 | * fileio.c (e_write): Fix the handling of | ||
| 4 | CODING_FINISH_INSUFFICIENT_SRC. | ||
| 5 | |||
| 1 | 2000-02-01 Dave Love <fx@gnu.org> | 6 | 2000-02-01 Dave Love <fx@gnu.org> |
| 2 | 7 | ||
| 3 | * editfns.c (Fpropertize): Doc fix. | 8 | * editfns.c (Fpropertize): Doc fix. |
diff --git a/src/fileio.c b/src/fileio.c index c3f2a2c9cba..127d883a044 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4986,7 +4986,10 @@ e_write (desc, string, start, end, coding) | |||
| 4986 | break; | 4986 | break; |
| 4987 | } | 4987 | } |
| 4988 | } | 4988 | } |
| 4989 | if (result == CODING_FINISH_INSUFFICIENT_SRC) | 4989 | nbytes -= coding->consumed; |
| 4990 | addr += coding->consumed; | ||
| 4991 | if (result == CODING_FINISH_INSUFFICIENT_SRC | ||
| 4992 | && nbytes > 0) | ||
| 4990 | { | 4993 | { |
| 4991 | /* The source text ends by an incomplete multibyte form. | 4994 | /* The source text ends by an incomplete multibyte form. |
| 4992 | There's no way other than write it out as is. */ | 4995 | There's no way other than write it out as is. */ |
| @@ -4999,8 +5002,6 @@ e_write (desc, string, start, end, coding) | |||
| 4999 | } | 5002 | } |
| 5000 | if (nbytes <= 0) | 5003 | if (nbytes <= 0) |
| 5001 | break; | 5004 | break; |
| 5002 | nbytes -= coding->consumed; | ||
| 5003 | addr += coding->consumed; | ||
| 5004 | start += coding->consumed_char; | 5005 | start += coding->consumed_char; |
| 5005 | if (coding->cmp_data) | 5006 | if (coding->cmp_data) |
| 5006 | coding_adjust_composition_offset (coding, start); | 5007 | coding_adjust_composition_offset (coding, start); |