summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-11 19:33:37 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-11 19:33:37 +0000
commitd6574e5901dd6619c309f998e5afe383cc9371b7 (patch)
tree2d6c8fe3a2adf22434055d6c58a19dedaf65841b
parente16d28b85689c751cfc7984fab97ee18e085702b (diff)
downloadruby-d6574e5901dd6619c309f998e5afe383cc9371b7.tar.gz
ruby-d6574e5901dd6619c309f998e5afe383cc9371b7.tar.xz
ruby-d6574e5901dd6619c309f998e5afe383cc9371b7.zip
* ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/nkf/nkf-utf8/nkf.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fc6dffb6..5e05641d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 12 04:31:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.
+
Fri Jan 11 23:22:31 2008 Tanaka Akira <akr@fsij.org>
* string.c (string.c): call rb_str_buf_append to update encoding of
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 431027b57..54f690a95 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -2045,6 +2045,8 @@ void options(unsigned char *cp)
} else if (*cp=='0') {
mime_decode_f = FALSE;
mime_f = FALSE; cp++;
+ } else {
+ mime_f = STRICT_MIME;
}
continue;
case 'M': /* MIME output */