Mercurial > vim
changeset 7237:2a95fa0a07b5 v7.4.927
commit https://github.com/vim/vim/commit/9b1067e038d371bd6c51e5da025383761f4921b4
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 19 19:33:15 2015 +0100
patch 7.4.927
Problem: Ruby crashes when there is a runtime error.
Solution: Use ruby_options() instead of ruby_process_options(). (Damien)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 19 Nov 2015 19:45:04 +0100 |
| parents | 99a879745889 |
| children | c8cdc5a88cda |
| files | src/if_ruby.c src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -280,7 +280,7 @@ static void ruby_vim_init(void); # define rb_enc_str_new dll_rb_enc_str_new # define rb_sprintf dll_rb_sprintf # define rb_require dll_rb_require -# define ruby_process_options dll_ruby_process_options +# define ruby_options dll_ruby_options # endif /* @@ -384,7 +384,7 @@ static rb_encoding* (*dll_rb_enc_find) ( static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*); static VALUE (*dll_rb_sprintf) (const char*, ...); static VALUE (*dll_rb_require) (const char*); -static void* (*ruby_process_options)(int, char**); +static void* (*ruby_options)(int, char**); # endif # if defined(USE_RGENGC) && USE_RGENGC @@ -565,7 +565,7 @@ static struct {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new}, {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf}, {"rb_require", (RUBY_PROC*)&dll_rb_require}, - {"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options}, + {"ruby_options", (RUBY_PROC*)&dll_ruby_options}, # endif # if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK) # ifdef __ia64 @@ -817,7 +817,7 @@ static int ensure_ruby_initialized(void) { int dummy_argc = 2; char *dummy_argv[] = {"vim-ruby", "-e0"}; - ruby_process_options(dummy_argc, dummy_argv); + ruby_options(dummy_argc, dummy_argv); } ruby_script("vim-ruby"); #else