aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2002-07-17 10:21:01 +0000
committerDave Love2002-07-17 10:21:01 +0000
commit6f197c07d05b591d94527fca34bce3ce2bedca60 (patch)
treeec184bf50b91107438855a76cc76a07b316eadc7
parentfd3aa3e1b9dada9e28c371db10ec0a89b9d069ed (diff)
downloademacs-6f197c07d05b591d94527fca34bce3ce2bedca60.tar.gz
emacs-6f197c07d05b591d94527fca34bce3ce2bedca60.zip
(adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/coding.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e6f723c8d91..864459179fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12002-07-17 Dave Love <fx@gnu.org>
2
3 * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
4
12002-07-16 Dave Love <fx@gnu.org> 52002-07-16 Dave Love <fx@gnu.org>
2 6
3 * casetab.c (init_casetab_once, init_casetab_once): Fix 7 * casetab.c (init_casetab_once, init_casetab_once): Fix
diff --git a/src/coding.c b/src/coding.c
index f9dd3f87742..bd548799a17 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1,7 +1,7 @@
1/* Coding system handler (conversion, detection, and etc). 1/* Coding system handler (conversion, detection, and etc).
2 Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. 2 Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
3 Licensed to the Free Software Foundation. 3 Licensed to the Free Software Foundation.
4 Copyright (C) 2001 Free Software Foundation, Inc. 4 Copyright (C) 2001, 2002 Free Software Foundation, Inc.
5 Copyright (C) 2001, 2002 5 Copyright (C) 2001, 2002
6 National Institute of Advanced Industrial Science and Technology (AIST) 6 National Institute of Advanced Industrial Science and Technology (AIST)
7 Registration Number H13PRO009 7 Registration Number H13PRO009
@@ -4982,9 +4982,9 @@ adjust_coding_eol_type (coding, eol_seen)
4982 eol_type = CODING_ID_EOL_TYPE (coding->id); 4982 eol_type = CODING_ID_EOL_TYPE (coding->id);
4983 if (eol_seen & EOL_SEEN_LF) 4983 if (eol_seen & EOL_SEEN_LF)
4984 coding->id = CODING_SYSTEM_ID (AREF (eol_type, 0)); 4984 coding->id = CODING_SYSTEM_ID (AREF (eol_type, 0));
4985 else if (eol_type & EOL_SEEN_CRLF) 4985 else if (eol_seen & EOL_SEEN_CRLF)
4986 coding->id = CODING_SYSTEM_ID (AREF (eol_type, 1)); 4986 coding->id = CODING_SYSTEM_ID (AREF (eol_type, 1));
4987 else if (eol_type & EOL_SEEN_CR) 4987 else if (eol_seen & EOL_SEEN_CR)
4988 coding->id = CODING_SYSTEM_ID (AREF (eol_type, 2)); 4988 coding->id = CODING_SYSTEM_ID (AREF (eol_type, 2));
4989} 4989}
4990 4990