Changeset 4060

Timestamp:

04/23/06 10:08:14 (3 years ago)

Author:

miyoshi

Message:

Undo the last merge temporarily. Refer to ticket:296.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/coding.c (modified) (8 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-04-23  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * coding.c: Undo the last merge temporarily.  Refer to ticket:296.
+
-2006-04-16  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/coding.c

@@ -736 +736 @@
-        else                                                    \
-          {                                                     \
-8
+A
-            *p++ = c;                                           \
-          }                                                     \
@@ -3608 +3608 @@
-      coding->eol_type = CODING_EOL_UNDECIDED;
-      coding->common_flags = CODING_REQUIRE_DETECTION_MASK;
-      if (system_eol_type != CODING_EOL_LF)
-        coding->common_flags |= CODING_REQUIRE_ENCODING_MASK;
-    }
-  else if (XFASTINT (eol_type) == 1)
@@ -3925 +3923 @@
-  coding->category_idx = CODING_CATEGORY_IDX_BINARY;
-  coding->common_flags = 0;
-
-
-
-
+
-  coding->pre_write_conversion = coding->post_read_conversion = Qnil;
-NILP (coding_system) ? 0 : 
+
-}
-
@@ -5004 +4999 @@
-  coding->errors = 0;
-  coding->result = CODING_FINISH_NORMAL;
-  if (coding->eol_type == CODING_EOL_UNDECIDED)
-    coding->eol_type = system_eol_type;
-
-  switch (coding->type)
@@ -5262 +5255 @@
-      || coding->eol_type == CODING_EOL_CRLF
-      || coding->eol_type == CODING_EOL_CR
-      || (coding->eol_type == CODING_EOL_UNDECIDED
-          && system_eol_type != CODING_EOL_LF)
-      || (coding->cmp_data && coding->cmp_data->used > 0))
-    {
@@ -7119 +7110 @@
-  to = XFASTINT (end);
-
- && system_eol_type == CODING_EOL_LF
+
-    return make_number (to - from);
-
@@ -7174 +7165 @@
-  CHECK_SYMBOL (coding_system);
-
- && system_eol_type == CODING_EOL_LF
+
-    return (NILP (nocopy) ? Fcopy_sequence (string) : string);
-
@@ -7233 +7224 @@
-  CHECK_SYMBOL (coding_system);
-
- && system_eol_type == CODING_EOL_LF
+
-    return string;
-