diff options
| author | Bram Moolenaar <bram@vim.org> | 2010-11-24 17:03:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2010-11-24 17:03:38 +0100 |
| commit | e30019bcf18a440e1b14c2e27ec76bdb980ff592 (patch) | |
| tree | 23d6e0a0d66eed43117d94537eb9a0dc90b70231 | |
| parent | ed9f926127660a3ab6bdfffdfca3a52e81e3e604 (diff) | |
| download | vim-7.3.067.tar.gz | |
Problem: Ruby: Init_prelude is not always available.
Solution: Remove use of Init_prelude. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/if_ruby.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index d86f6be4..70f6046a 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -231,7 +231,6 @@ static void ruby_vim_init(void); # define rb_enc_str_new dll_rb_enc_str_new # define rb_intern2 dll_rb_intern2 # define rb_const_remove dll_rb_const_remove -# define Init_prelude dll_Init_prelude # define rb_sprintf dll_rb_sprintf # define ruby_init_stack dll_ruby_init_stack #endif @@ -433,7 +432,6 @@ static struct {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new}, {"rb_intern2", (RUBY_PROC*)&dll_rb_intern2}, {"rb_const_remove", (RUBY_PROC*)&dll_rb_const_remove}, - {"Init_prelude", (RUBY_PROC*)&dll_Init_prelude}, {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf}, {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack}, #endif @@ -675,7 +673,6 @@ static int ensure_ruby_initialized(void) /* This avoids the error "Encoding::ConverterNotFoundError: code * converter not found (UTF-16LE to ASCII-8BIT)". */ rb_define_module("Gem"); - Init_prelude(); rb_const_remove(rb_cObject, rb_intern2("TMP_RUBY_PREFIX", 15)); #endif ruby_vim_init(); diff --git a/src/version.c b/src/version.c index 95c02628..bd569622 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 67, +/**/ 66, /**/ 65, |