summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-13 20:08:43 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-13 20:08:43 +0200
commit2016ae586b12513d973aabc30ed758b543114cbe (patch)
treeb39f8dd978582bc35ba38a97c8f2f548a7a496af
parent76ae22fef3cb224ca7fbf97517f881e825d4d0c2 (diff)
downloadvim-git-2016ae586b12513d973aabc30ed758b543114cbe.tar.gz
patch 7.4.1929v7.4.1929
Problem: Inconsistent indenting and weird name. Solution: Fix indent, make name all upper case. (Ken Takata)
-rw-r--r--src/if_ruby.c12
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 7e49906b6..f0c441ada 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -31,8 +31,8 @@
# define RUBYEXTERN extern
#endif
-# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 24
- # define USE_RUBY_Integer
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 24
+# define USE_RUBY_INTEGER
#endif
#ifdef DYNAMIC_RUBY
@@ -43,8 +43,8 @@
*/
# define rb_cFalseClass (*dll_rb_cFalseClass)
# define rb_cFixnum (*dll_rb_cFixnum)
-# if defined(USE_RUBY_Integer)
-# define rb_cInteger (*dll_rb_cInteger)
+# if defined(USE_RUBY_INTEGER)
+# define rb_cInteger (*dll_rb_cInteger)
# endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20
# define rb_cFloat (*dll_rb_cFloat)
@@ -325,7 +325,7 @@ static void ruby_vim_init(void);
static VALUE (*dll_rb_assoc_new) (VALUE, VALUE);
VALUE *dll_rb_cFalseClass;
VALUE *dll_rb_cFixnum;
-# if defined(USE_RUBY_Integer)
+# if defined(USE_RUBY_INTEGER)
VALUE *dll_rb_cInteger;
# endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20
@@ -515,7 +515,7 @@ static struct
{"rb_assoc_new", (RUBY_PROC*)&dll_rb_assoc_new},
{"rb_cFalseClass", (RUBY_PROC*)&dll_rb_cFalseClass},
{"rb_cFixnum", (RUBY_PROC*)&dll_rb_cFixnum},
-# if defined(USE_RUBY_Integer)
+# if defined(USE_RUBY_INTEGER)
{"rb_cInteger", (RUBY_PROC*)&dll_rb_cInteger},
# endif
# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20
diff --git a/src/version.c b/src/version.c
index 516e5ff96..de67ab2a5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1929,
+/**/
1928,
/**/
1927,