patch 7.4.1689

Problem:    Ruby interface has inconsistent coding style.
Solution:   Fix the coding style. (Ken Takata)

diff --git a/src/if_ruby.c b/src/if_ruby.c
index a7a7772e3e6a931c181c9ae771d5f44ef8c8ab71..80ffa49d317ad763d32002eb496c197fed983934 100644 (file)
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -731,7 +731,8 @@ vim_str2rb_enc_str(const char *s)
     {
        enc = rb_enc_find((char *)sval);
        vim_free(sval);
-       if (enc) {
+       if (enc)
+       {
            return rb_enc_str_new(s, strlen(s), enc);
        }
     }
@@ -773,19 +774,23 @@ void ex_rubydo(exarg_T *eap)
     {
        if (u_save(eap->line1 - 1, eap->line2 + 1) != OK)
            return;
-       for (i = eap->line1; i <= eap->line2; i++) {
+       for (i = eap->line1; i <= eap->line2; i++)
+       {
            VALUE line;
 
            line = vim_str2rb_enc_str((char *)ml_get(i));
            rb_lastline_set(line);
            eval_enc_string_protect((char *) eap->arg, &state);
-           if (state) {
+           if (state)
+           {
                error_print(state);
                break;
            }
            line = rb_lastline_get();
-           if (!NIL_P(line)) {
-               if (TYPE(line) != T_STRING) {
+           if (!NIL_P(line))
+           {
+               if (TYPE(line) != T_STRING)
+               {
                    EMSG(_("E265: $_ must be an instance of String"));
                    return;
                }
@@ -898,7 +903,8 @@ static void error_print(int state)
 #define TAG_FATAL      0x8
 #define TAG_MASK       0xf
 
-    switch (state) {
+    switch (state)
+    {
     case TAG_RETURN:
        EMSG(_("E267: unexpected return"));
        break;
@@ -923,10 +929,12 @@ static void error_print(int state)
        eclass = CLASS_OF(ruby_errinfo);
        einfo = rb_obj_as_string(ruby_errinfo);
 #endif
-       if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
+       if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0)
+       {
            EMSG(_("E272: unhandled exception"));
        }
-       else {
+       else
+       {
            VALUE epath;
            char *p;
 
@@ -1208,7 +1216,8 @@ static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
        /* set curwin/curbuf for "buf" and save some things */
        aucmd_prepbuf(&aco, buf);
 
-       if (u_savesub(n) == OK) {
+       if (u_savesub(n) == OK)
+       {
            ml_replace(n, (char_u *)line, TRUE);
            changed();
 #ifdef SYNTAX_HL
@@ -1249,7 +1258,8 @@ static VALUE buffer_delete(VALUE self, VALUE num)
        /* set curwin/curbuf for "buf" and save some things */
        aucmd_prepbuf(&aco, buf);
 
-       if (u_savedel(n, 1) == OK) {
+       if (u_savedel(n, 1) == OK)
+       {
            ml_delete(n, 0);
 
            /* Changes to non-active buffers should properly refresh
@@ -1288,7 +1298,8 @@ static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
        /* set curwin/curbuf for "buf" and save some things */
        aucmd_prepbuf(&aco, buf);
 
-       if (u_inssub(n + 1) == OK) {
+       if (u_inssub(n + 1) == OK)
+       {
            ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
 
            /*  Changes to non-active buffers should properly refresh screen
@@ -1494,7 +1505,8 @@ static VALUE f_p(int argc, VALUE *argv, VALUE self UNUSED)
     int i;
     VALUE str = rb_str_new("", 0);
 
-    for (i = 0; i < argc; i++) {
+    for (i = 0; i < argc; i++)
+    {
        if (i > 0) rb_str_cat(str, ", ", 2);
        rb_str_concat(str, rb_inspect(argv[i]));
     }

diff --git a/src/version.c b/src/version.c
index c7e1639d4267aaa07cb0f7aade98ca12005da880..8d32e2a0d3a2d3144da7952f30f85c18c385632d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1689,
 /**/
     1688,
 /**/