patch 7.4.927

Problem:    Ruby crashes when there is a runtime error.
Solution:   Use ruby_options() instead of ruby_process_options(). (Damien)

diff --git a/src/if_ruby.c b/src/if_ruby.c
index ac2387857e7c9b4dda4703e98d53a807cdae57a5..5d3089d1aa1c7f1f152a991cca6cc8c74da3db79 100644 (file)
--- 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) (const char*);
 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

diff --git a/src/version.c b/src/version.c
index 20e0e9fe232c8c95370ca0f0bb3184fa63d9f187..feda1de76731433fb54cc2d5e7f10305812cd621 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    927,
 /**/
     926,
 /**/