updated for version 7.0223

diff --git a/src/if_ruby.c b/src/if_ruby.c
index 6e9f95d652f704dd698f53420bd7e6bd79c67974..e424c5d921721b9a2c653b8e11a8ca007922712f 100644 (file)
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -325,7 +325,7 @@ void ex_ruby(exarg_T *eap)
     int state;
     char *script = NULL;
 
-    script = script_get(eap, eap->arg);
+    script = (char *)script_get(eap, eap->arg);
     if (!eap->skip && ensure_ruby_initialized())
     {
        if (script == NULL)
@@ -350,7 +350,7 @@ void ex_rubydo(exarg_T *eap)
        for (i = eap->line1; i <= eap->line2; i++) {
            VALUE line, oldline;
 
-           line = oldline = rb_str_new2(ml_get(i));
+           line = oldline = rb_str_new2((char *)ml_get(i));
            rb_lastline_set(line);
            rb_eval_string_protect((char *) eap->arg, &state);
            if (state) {
@@ -521,9 +521,9 @@ static VALUE vim_evaluate(VALUE self, VALUE str)
 #ifdef FEAT_EVAL
     char_u *value = eval_to_string((char_u *)STR2CSTR(str), NULL, TRUE);
 
-    if (value)
+    if (value != NULL)
     {
-       VALUE val = rb_str_new2(value);
+       VALUE val = rb_str_new2((char *)value);
        vim_free(value);
        return val;
     }
@@ -587,7 +587,7 @@ static VALUE buffer_name(VALUE self)
 {
     buf_T *buf = get_buf(self);
 
-    return buf->b_ffname ? rb_str_new2(buf->b_ffname) : Qnil;
+    return buf->b_ffname ? rb_str_new2((char *)buf->b_ffname) : Qnil;
 }
 
 static VALUE buffer_number(VALUE self)
@@ -610,7 +610,7 @@ static VALUE buffer_aref(VALUE self, VALUE num)
     long n = NUM2LONG(num);
 
     if (n > 0 && n <= buf->b_ml.ml_line_count) {
-       char *line = ml_get_buf(buf, n, FALSE);
+       char *line = (char *)ml_get_buf(buf, n, FALSE);
        return line ? rb_str_new2(line) : Qnil;
     }
     else {

diff --git a/src/normal.c b/src/normal.c
index 5fb0473ad525a09230d349081da95410408547c6..beb3cc3ffe6c56f99e30ebd9cbd7785c138ad005 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -8006,6 +8006,12 @@ nv_g_cmd(cap)
        break;
 #endif
 
+    case '+':
+    case '-': /* "g+" and "g-": undo or redo along the timeline */
+       if (!checkclearopq(oap))
+           undo_time((int)(cap->nchar == '-' ? -cap->count1 : cap->count1));
+       break;
+
     default:
        clearopbeep(oap);
        break;