aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-04-13 04:58:07 +0000
committerKenichi Handa2006-04-13 04:58:07 +0000
commit73ec0f8900908f70f8b5daafc7f114f6e53a1ae2 (patch)
treed0e377e6a728afed14c7e4c1f9cb8709f9bc92f6 /src
parent9642847f36380bc6c39bf8d19b907266d72fbd61 (diff)
downloademacs-73ec0f8900908f70f8b5daafc7f114f6e53a1ae2.tar.gz
emacs-73ec0f8900908f70f8b5daafc7f114f6e53a1ae2.zip
(shrink_encoding_region): If eol_type is not yet decided and
system_eol_type is not LF, don't shrink.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/coding.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9955aabd0e7..d353e19eabf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
3 * coding.c (setup_coding_system): Fix previous change. 3 * coding.c (setup_coding_system): Fix previous change.
4 (encode_coding): If eol_type is not yet decided, use 4 (encode_coding): If eol_type is not yet decided, use
5 system_eol_type. 5 system_eol_type.
6 (shrink_encoding_region): If eol_type is not yet decided and
7 system_eol_type is not LF, don't shrink.
6 8
72006-04-13 Nick Roberts <nickrob@snap.net.nz> 92006-04-13 Nick Roberts <nickrob@snap.net.nz>
8 10
diff --git a/src/coding.c b/src/coding.c
index 5fb4c202b85..ba121df242e 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5256,6 +5256,8 @@ shrink_encoding_region (beg, end, coding, str)
5256 if (coding->type == coding_type_ccl 5256 if (coding->type == coding_type_ccl
5257 || coding->eol_type == CODING_EOL_CRLF 5257 || coding->eol_type == CODING_EOL_CRLF
5258 || coding->eol_type == CODING_EOL_CR 5258 || coding->eol_type == CODING_EOL_CR
5259 || (coding->eol_type == CODING_EOL_UNDECIDED
5260 && system_eol_type != CODING_EOL_LF)
5259 || (coding->cmp_data && coding->cmp_data->used > 0)) 5261 || (coding->cmp_data && coding->cmp_data->used > 0))
5260 { 5262 {
5261 /* We can't skip any data. */ 5263 /* We can't skip any data. */