Mercurial > vim
changeset 31410:f09c92cf3786 v9.0.1038
patch 9.0.1038: function name does not match what it is used for
Commit: https://github.com/vim/vim/commit/ffa4e9b43a3d6d7f412f54637a4b1076ed2bc2f4
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Dec 9 11:36:36 2022 +0000
patch 9.0.1038: function name does not match what it is used for
Problem: Function name does not match what it is used for.
Solution: Include the modifier in the name. (closes https://github.com/vim/vim/issues/11679)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 09 Dec 2022 12:45:04 +0100 |
| parents | e9572de53c6d |
| children | 533370cc392d |
| files | src/ex_getln.c src/version.c |
| diffstat | 2 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -798,12 +798,13 @@ cmdline_init(void) } /* - * Handle the backslash key pressed in the command-line mode. CTRL-\ CTRL-N - * goes to Normal mode, CTRL-\ CTRL-G goes to Insert mode when 'insertmode' is - * set, CTRL-\ e prompts for an expression. + * Handle CTRL-\ pressed in Command-line mode: + * - CTRL-\ CTRL-N goes to Normal mode + * - CTRL-\ CTRL-G goes to Insert mode when 'insertmode' is set + * - CTRL-\ e prompts for an expression. */ static int -cmdline_handle_backslash_key(int c, int *gotesc) +cmdline_handle_ctrl_bsl(int c, int *gotesc) { ++no_mapping; ++allow_keys; @@ -832,8 +833,7 @@ cmdline_handle_backslash_key(int c, int /* * Replace the command line with the result of an expression. - * Need to save and restore the current command line, to be - * able to enter a new one... + * This will call getcmdline() recursively in get_expr_register(). */ if (ccline.cmdpos == ccline.cmdlen) new_cmdpos = 99999; // keep it at the end @@ -843,9 +843,8 @@ cmdline_handle_backslash_key(int c, int c = get_expr_register(); if (c == '=') { - // Need to save and restore ccline. And set "textlock" - // to avoid nasty things like going to another buffer when - // evaluating an expression. + // Evaluate the expression. Set "textlock" to avoid nasty things + // like going to another buffer. ++textlock; p = get_expr_line(); --textlock; @@ -1909,7 +1908,7 @@ getcmdline_int( // mode when 'insertmode' is set, CTRL-\ e prompts for an expression. if (c == Ctrl_BSL) { - res = cmdline_handle_backslash_key(c, &gotesc); + res = cmdline_handle_ctrl_bsl(c, &gotesc); if (res == CMDLINE_CHANGED) goto cmdline_changed; else if (res == CMDLINE_NOT_CHANGED) @@ -1917,7 +1916,7 @@ getcmdline_int( else if (res == GOTO_NORMAL_MODE) goto returncmd; // back to cmd mode c = Ctrl_BSL; // backslash key not processed by - // cmdline_handle_backslash_key() + // cmdline_handle_ctrl_bsl() } if (c == cedit_key || c == K_CMDWIN)