aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.927

Browse Source 
Problem:    Ruby crashes when there is a runtime error.
Solution:   Use ruby_options() instead of ruby_process_options(). (Damien)
This commit is contained in:
Bram Moolenaar
2015-11-19 19:33:15 +01:00
parent 4f8fa1633c
commit 9b1067e038
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/if_ruby.c
View File

@@ -280,7 +280,7 @@ static void ruby_vim_init(void);
# define rb_enc_str_new dll_rb_enc_str_new # define rb_enc_str_new dll_rb_enc_str_new
# define rb_sprintf dll_rb_sprintf # define rb_sprintf dll_rb_sprintf
# define rb_require dll_rb_require # define rb_require dll_rb_require
# define ruby_process_options dll_ruby_process_options # define ruby_options dll_ruby_options
# endif # endif
/* /*
@@ -384,7 +384,7 @@ static rb_encoding* (*dll_rb_enc_find) (const char*);
static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*); static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
static VALUE (*dll_rb_sprintf) (const char*, ...); static VALUE (*dll_rb_sprintf) (const char*, ...);
static VALUE (*dll_rb_require) (const char*); static VALUE (*dll_rb_require) (const char*);
static void* (*ruby_process_options)(int, char**); static void* (*ruby_options)(int, char**);
# endif # endif
# if defined(USE_RGENGC) && USE_RGENGC # if defined(USE_RGENGC) && USE_RGENGC
@@ -565,7 +565,7 @@ static struct
{"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new}, {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
{"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf}, {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
{"rb_require", (RUBY_PROC*)&dll_rb_require}, {"rb_require", (RUBY_PROC*)&dll_rb_require},
{"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options}, {"ruby_options", (RUBY_PROC*)&dll_ruby_options},
# endif # endif
# if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK) # if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
# ifdef __ia64 # ifdef __ia64
@@ -817,7 +817,7 @@ static int ensure_ruby_initialized(void)
{ {
int dummy_argc = 2; int dummy_argc = 2;
char *dummy_argv[] = {"vim-ruby", "-e0"}; char *dummy_argv[] = {"vim-ruby", "-e0"};
ruby_process_options(dummy_argc, dummy_argv); ruby_options(dummy_argc, dummy_argv);
} }
ruby_script("vim-ruby"); ruby_script("vim-ruby");
#else #else

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
927,
/**/ /**/
926, 926,
/**/ /**/