diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
| commit | 1b7d03b9d0d60d4dede7d38739503e59a8b25d06 (patch) | |
| tree | deb58ca3dc6d6cd71c1740e62aa7e47bea5ed37e /enc/emacs_mule.c | |
| parent | 5a5ea533fd8c5c95ca0dcd5e4cce2558ebba62c5 (diff) | |
| download | ruby-1b7d03b9d0d60d4dede7d38739503e59a8b25d06.tar.gz | |
Merge Onigmo 6.0.0
* https://github.com/k-takata/Onigmo/blob/Onigmo-6.0.0/HISTORY
* fix for ruby 2.4: https://github.com/k-takata/Onigmo/pull/78
* suppress warning: https://github.com/k-takata/Onigmo/pull/79
* include/ruby/oniguruma.h: include onigmo.h.
* template/encdb.h.tmpl: ignore duplicated definition of EUC-CN in
enc/euc_kr.c. It is defined in enc/gb2313.c with CRuby macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/emacs_mule.c')
| -rw-r--r-- | enc/emacs_mule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c index a53f243dfe..f92eb183cf 100644 --- a/enc/emacs_mule.c +++ b/enc/emacs_mule.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include "regint.h" +#include "regenc.h" #define emacsmule_islead(c) ((UChar )(c) < 0x9e) @@ -334,9 +334,9 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = { onigenc_not_support_get_ctype_code_range, left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match, + onigenc_ascii_only_case_map, 0, ONIGENC_FLAG_NONE, - onigenc_ascii_only_case_map, }; ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule") |