Skip to content

Commit 9b1067e

Browse files
committed
patch 7.4.927
Problem: Ruby crashes when there is a runtime error. Solution: Use ruby_options() instead of ruby_process_options(). (Damien)
1 parent 4f8fa16 commit 9b1067e

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/if_ruby.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static void ruby_vim_init(void);
280280
# define rb_enc_str_new dll_rb_enc_str_new
281281
# define rb_sprintf dll_rb_sprintf
282282
# define rb_require dll_rb_require
283-
# define ruby_process_options dll_ruby_process_options
283+
# define ruby_options dll_ruby_options
284284
# endif
285285

286286
/*
@@ -384,7 +384,7 @@ static rb_encoding* (*dll_rb_enc_find) (const char*);
384384
static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
385385
static VALUE (*dll_rb_sprintf) (const char*, ...);
386386
static VALUE (*dll_rb_require) (const char*);
387-
static void* (*ruby_process_options)(int, char**);
387+
static void* (*ruby_options)(int, char**);
388388
# endif
389389

390390
# if defined(USE_RGENGC) && USE_RGENGC
@@ -565,7 +565,7 @@ static struct
565565
{"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
566566
{"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
567567
{"rb_require", (RUBY_PROC*)&dll_rb_require},
568-
{"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options},
568+
{"ruby_options", (RUBY_PROC*)&dll_ruby_options},
569569
# endif
570570
# if defined(RUBY19_OR_LATER) || defined(RUBY_INIT_STACK)
571571
# ifdef __ia64
@@ -817,7 +817,7 @@ static int ensure_ruby_initialized(void)
817817
{
818818
int dummy_argc = 2;
819819
char *dummy_argv[] = {"vim-ruby", "-e0"};
820-
ruby_process_options(dummy_argc, dummy_argv);
820+
ruby_options(dummy_argc, dummy_argv);
821821
}
822822
ruby_script("vim-ruby");
823823
#else

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
927,
744746
/**/
745747
926,
746748
/**/

0 commit comments

Comments
 (0)