diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-13 13:44:02 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-13 13:44:02 +0000 |
commit | a648fc802bd626dc29ec690f29c6a69f2510b0cb (patch) | |
tree | 06dfcf6a2ac7c8db44196c02489aa209c5ead9b0 /re.c | |
parent | 968918da16ea89434798d29247e247601a046a9d (diff) | |
download | ruby-a648fc802bd626dc29ec690f29c6a69f2510b0cb.tar.gz |
* encoding.c (rb_enc_compatible): encoding should never fall back
to ASCII-8BIT unless both encodings are ASCII-8BIT.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -144,6 +144,7 @@ rb_memsearch(const void *x0, long m, const void *y0, long n) #define ARG_KCODE_EUC 1 #define ARG_KCODE_SJIS 2 #define ARG_KCODE_UTF8 3 +#define ARG_KCODE_MASK 3 static int char_to_option(int c) @@ -1968,7 +1969,7 @@ rb_reg_initialize(VALUE obj, const char *s, int len, rb_encoding *enc, if (unescaped == Qnil) return -1; - if (fixed_enc && (options & ARG_ENCODING_FIXED) && fixed_enc != enc) { + if (fixed_enc && fixed_enc != enc) { strcpy(err, "character encodings differ"); return -1; } |