diff options
Diffstat (limited to 'src/ex_docmd.c')
-rw-r--r-- | src/ex_docmd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 01d411a632..534cd7e038 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -400,7 +400,7 @@ struct loop_cookie int current_line; // last read line from growarray int repeating; // TRUE when looping a second time // When "repeating" is FALSE use "getline" and "cookie" to get lines - char_u *(*getline)(int, void *, int, getline_opt_T); + char_u *(*lc_getline)(int, void *, int, getline_opt_T); void *cookie; }; @@ -940,7 +940,7 @@ do_cmdline( cmd_cookie = (void *)&cmd_loop_cookie; cmd_loop_cookie.lines_gap = &lines_ga; cmd_loop_cookie.current_line = current_line; - cmd_loop_cookie.getline = fgetline; + cmd_loop_cookie.lc_getline = fgetline; cmd_loop_cookie.cookie = cookie; cmd_loop_cookie.repeating = (current_line < lines_ga.ga_len); @@ -1468,10 +1468,10 @@ get_loop_line(int c, void *cookie, int indent, getline_opt_T options) return NULL; // trying to read past ":endwhile"/":endfor" // First time inside the ":while"/":for": get line normally. - if (cp->getline == NULL) + if (cp->lc_getline == NULL) line = getcmdline(c, 0L, indent, 0); else - line = cp->getline(c, cp->cookie, indent, options); + line = cp->lc_getline(c, cp->cookie, indent, options); if (line != NULL && store_loop_line(cp->lines_gap, line) == OK) ++cp->current_line; @@ -1534,7 +1534,7 @@ getline_equal( cp = (struct loop_cookie *)cookie; while (gp == get_loop_line) { - gp = cp->getline; + gp = cp->lc_getline; cp = cp->cookie; } return gp == func; @@ -1563,7 +1563,7 @@ getline_cookie( cp = (struct loop_cookie *)cookie; while (gp == get_loop_line) { - gp = cp->getline; + gp = cp->lc_getline; cp = cp->cookie; } return cp; @@ -1598,7 +1598,7 @@ getline_peek( wp = (wcmd_T *)(cp->lines_gap->ga_data) + cp->current_line + 1; return wp->line; } - gp = cp->getline; + gp = cp->lc_getline; cp = cp->cookie; } if (gp == getsourceline) @@ -1780,7 +1780,7 @@ do_one_cmd( // The "ea" structure holds the arguments that can be used. ea.cmd = *cmdlinep; ea.cmdlinep = cmdlinep; - ea.getline = fgetline; + ea.ea_getline = fgetline; ea.cookie = cookie; #ifdef FEAT_EVAL ea.cstack = cstack; @@ -2844,8 +2844,8 @@ parse_command_modifiers( // in ex mode, an empty command (after modifiers) works like :+ if (*eap->cmd == NUL && exmode_active - && (getline_equal(eap->getline, eap->cookie, getexmodeline) - || getline_equal(eap->getline, eap->cookie, getexline)) + && (getline_equal(eap->ea_getline, eap->cookie, getexmodeline) + || getline_equal(eap->ea_getline, eap->cookie, getexline)) && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) { use_plus_cmd = TRUE; |