From 6f197c07d05b591d94527fca34bce3ce2bedca60 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Wed, 17 Jul 2002 10:21:01 +0000 Subject: [PATCH] (adjust_coding_eol_type): Fix eol_type/eol_seen mixup. --- src/ChangeLog | 4 ++++ src/coding.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e6f723c8d9..864459179f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-07-17 Dave Love + + * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup. + 2002-07-16 Dave Love * casetab.c (init_casetab_once, init_casetab_once): Fix diff --git a/src/coding.c b/src/coding.c index f9dd3f8774..bd548799a1 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1,7 +1,7 @@ /* Coding system handler (conversion, detection, and etc). Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002 Free Software Foundation, Inc. Copyright (C) 2001, 2002 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 @@ -4982,9 +4982,9 @@ adjust_coding_eol_type (coding, eol_seen) eol_type = CODING_ID_EOL_TYPE (coding->id); if (eol_seen & EOL_SEEN_LF) coding->id = CODING_SYSTEM_ID (AREF (eol_type, 0)); - else if (eol_type & EOL_SEEN_CRLF) + else if (eol_seen & EOL_SEEN_CRLF) coding->id = CODING_SYSTEM_ID (AREF (eol_type, 1)); - else if (eol_type & EOL_SEEN_CR) + else if (eol_seen & EOL_SEEN_CR) coding->id = CODING_SYSTEM_ID (AREF (eol_type, 2)); } -- 2.20.1