diff options
| author | Karoly Lorentey | 2005-01-06 15:00:09 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-01-06 15:00:09 +0000 |
| commit | 0feecea9fb7079a2c1fbfee32a992449a22cf478 (patch) | |
| tree | 0826d68e3dc2ce370c7bd4dae7db3cffc3568321 /src/coding.c | |
| parent | 17d51b68fb4e7da4f18eff72c589b7ffc4f9c22c (diff) | |
| parent | 1a63439b34c3455a317feda5c271dfdb7af0296b (diff) | |
| download | emacs-0feecea9fb7079a2c1fbfee32a992449a22cf478.tar.gz emacs-0feecea9fb7079a2c1fbfee32a992449a22cf478.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-752
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-278
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 3ddd7ea957d..ce78af7d8d3 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -5877,7 +5877,6 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace) | |||
| 5877 | REQUIRE + LEN_BYTE = LEN_BYTE * (NEW / ORIG) | 5877 | REQUIRE + LEN_BYTE = LEN_BYTE * (NEW / ORIG) |
| 5878 | REQUIRE = LEN_BYTE * (NEW - ORIG) / ORIG | 5878 | REQUIRE = LEN_BYTE * (NEW - ORIG) / ORIG |
| 5879 | Here, we are sure that NEW >= ORIG. */ | 5879 | Here, we are sure that NEW >= ORIG. */ |
| 5880 | float ratio; | ||
| 5881 | 5880 | ||
| 5882 | if (coding->produced <= coding->consumed) | 5881 | if (coding->produced <= coding->consumed) |
| 5883 | { | 5882 | { |
| @@ -5887,7 +5886,8 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace) | |||
| 5887 | } | 5886 | } |
| 5888 | else | 5887 | else |
| 5889 | { | 5888 | { |
| 5890 | ratio = (coding->produced - coding->consumed) / coding->consumed; | 5889 | float ratio = coding->produced - coding->consumed; |
| 5890 | ratio /= coding->consumed; | ||
| 5891 | require = len_byte * ratio; | 5891 | require = len_byte * ratio; |
| 5892 | } | 5892 | } |
| 5893 | first = 0; | 5893 | first = 0; |