Mercurial > vim
diff src/normal.c @ 32108:cbf0ed5c83d0 v9.0.1385
patch 9.0.1385: g'Esc is considered an error
Commit: https://github.com/vim/vim/commit/f86dea8119f3141e3d2c680219036d1511101f9b
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun Mar 5 21:15:06 2023 +0000
patch 9.0.1385: g'Esc is considered an error
Problem: g'Esc is considered an error.
Solution: Make g'Esc silently abandon the command. (closes https://github.com/vim/vim/issues/12110)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 05 Mar 2023 22:30:03 +0100 |
| parents | 717a1a8dc751 |
| children | 7d552e52fe92 |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -899,7 +899,7 @@ normal_cmd( State = MODE_NORMAL; - if (ca.nchar == ESC) + if (ca.nchar == ESC || ca.extra_char == ESC) { clearop(oap); if (restart_edit == 0 && goto_im()) @@ -984,7 +984,8 @@ normal_end: #ifdef CURSOR_SHAPE // Redraw the cursor with another shape, if we were in Operator-pending // mode or did a replace command. - if (prev_finish_op || ca.cmdchar == 'r') + if (prev_finish_op || ca.cmdchar == 'r' + || (ca.cmdchar == 'g' && ca.nchar == 'r')) { ui_cursor_shape(); // may show different cursor shape # ifdef FEAT_MOUSESHAPE @@ -5025,7 +5026,7 @@ nv_vreplace(cmdarg_T *cap) return; } - if (checkclearopq(cap->oap) || cap->extra_char == ESC) + if (checkclearopq(cap->oap)) return; if (!curbuf->b_p_ma) @@ -5903,7 +5904,7 @@ nv_g_cmd(cmdarg_T *cap) else #endif // "g^A/g^X": sequentially increment visually selected region - if (VIsual_active) + if (VIsual_active) { cap->arg = TRUE; cap->cmdchar = cap->nchar;