diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-09 11:36:36 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-12-09 11:36:36 +0000 |
| commit | ffa4e9b43a3d6d7f412f54637a4b1076ed2bc2f4 (patch) | |
| tree | b2ea31abef1ae8ef4301cfbb1893c0e5a8c0549d | |
| parent | 98aeb2100c2759111f93f0f0857e93d98afdc88a (diff) | |
| download | vim-git-9.0.1038.tar.gz | |
patch 9.0.1038: function name does not match what it is used forv9.0.1038
Problem: Function name does not match what it is used for.
Solution: Include the modifier in the name. (closes #11679)
| -rw-r--r-- | src/ex_getln.c | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 44049c761..4bd200d33 100644 --- 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 *gotesc) /* * 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 *gotesc) 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) diff --git a/src/version.c b/src/version.c index a39bdba2e..aac1cc977 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1038, +/**/ 1037, /**/ 1036, |