K.Takata's patch queue for Vim
| Revision | 8b80fb532f4f9191425acf9718889ce9280796e4 (tree) |
|---|---|
| Time | 2023-02-08 16:28:00 |
| Author | K.Takata <kentkt@csc....> |
| Commiter | K.Takata |
Update trigger incsearch patch
trigger-incsearch-on-cmdline-paste.patch (diff)| @@ -4,20 +4,43 @@ | ||
| 4 | 4 | diff --git a/src/ex_getln.c b/src/ex_getln.c |
| 5 | 5 | --- a/src/ex_getln.c |
| 6 | 6 | +++ b/src/ex_getln.c |
| 7 | -@@ -2081,11 +2081,12 @@ getcmdline_int( | |
| 7 | +@@ -1183,6 +1183,7 @@ cmdline_insert_reg(int *gotesc UNUSED) | |
| 8 | + { | |
| 9 | + int i; | |
| 10 | + int c; | |
| 11 | ++ int literally = FALSE; | |
| 12 | + #ifdef FEAT_EVAL | |
| 13 | + int save_new_cmdpos = new_cmdpos; | |
| 14 | + #endif | |
| 15 | +@@ -1220,7 +1221,8 @@ cmdline_insert_reg(int *gotesc UNUSED) | |
| 16 | + #endif | |
| 17 | + if (c != ESC) // use ESC to cancel inserting register | |
| 18 | + { | |
| 19 | +- cmdline_paste(c, i == Ctrl_R, FALSE); | |
| 20 | ++ literally = i == Ctrl_R; | |
| 21 | ++ cmdline_paste(c, literally, FALSE); | |
| 8 | 22 | |
| 23 | + #ifdef FEAT_EVAL | |
| 24 | + // When there was a serious error abort getting the | |
| 25 | +@@ -1252,7 +1254,7 @@ cmdline_insert_reg(int *gotesc UNUSED) | |
| 26 | + redrawcmd(); | |
| 27 | + | |
| 28 | + // The text has been stuffed, the command line didn't change yet. | |
| 29 | +- return CMDLINE_NOT_CHANGED; | |
| 30 | ++ return literally ? CMDLINE_NOT_CHANGED : CMDLINE_CHANGED; | |
| 31 | + } | |
| 32 | + | |
| 33 | + /* | |
| 34 | +@@ -2082,7 +2084,12 @@ getcmdline_int( | |
| 9 | 35 | case Ctrl_R: // insert register |
| 10 | 36 | res = cmdline_insert_reg(&gotesc); |
| 11 | -- if (res == CMDLINE_NOT_CHANGED) | |
| 12 | -- goto cmdline_not_changed; | |
| 13 | -- else if (res == GOTO_NORMAL_MODE) | |
| 14 | -+ if (res == GOTO_NORMAL_MODE) | |
| 37 | + if (res == CMDLINE_NOT_CHANGED) | |
| 38 | ++ { | |
| 39 | ++#ifdef FEAT_SEARCH_EXTRA | |
| 40 | ++ is_state.incsearch_postponed = TRUE; | |
| 41 | ++#endif | |
| 42 | + goto cmdline_not_changed; | |
| 43 | ++ } | |
| 44 | + else if (res == GOTO_NORMAL_MODE) | |
| 15 | 45 | goto returncmd; |
| 16 | -- goto cmdline_changed; | |
| 17 | -+#ifdef FEAT_SEARCH_EXTRA | |
| 18 | -+ is_state.incsearch_postponed = TRUE; | |
| 19 | -+#endif | |
| 20 | -+ goto cmdline_not_changed; | |
| 21 | - | |
| 22 | - case Ctrl_D: | |
| 23 | - if (showmatches(&xpc, FALSE) == EXPAND_NOTHING) | |
| 46 | + goto cmdline_changed; |
Fork