K.Takata's patch queue for Vim
| Revisão | cac30d3dcc2cc3df6cb7b7be77711d196e9d437d (tree) |
|---|---|
| Hora | 2024-03-29 11:03:29 |
| Autor | K.Takata <kentkt@csc....> |
| Commiter | K.Takata |
Update for 9.1.0207
Fix conflicts.
wip-autocmd-searchhitbt.patch (diff)| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | # HG changeset patch |
| 2 | -# Parent 909bb0f575dc11518f781856d9a23197bdbb29ec | |
| 2 | +# Parent 797312af1e1ec30f0c3aabb5fcca62be9833a179 | |
| 3 | 3 | |
| 4 | 4 | diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt |
| 5 | 5 | --- a/runtime/doc/autocmd.txt |
| 6 | 6 | +++ b/runtime/doc/autocmd.txt |
| 7 | -@@ -412,6 +412,9 @@ Name triggered by ~ | |
| 7 | +@@ -414,6 +414,9 @@ Name triggered by ~ | |
| 8 | 8 | |TextChangedT| after a change was made to the text in Terminal mode |
| 9 | 9 | |TextYankPost| after text has been yanked or deleted |
| 10 | 10 |
| @@ -14,7 +14,7 @@ | ||
| 14 | 14 | |SafeState| nothing pending, going to wait for the user to type a |
| 15 | 15 | character |
| 16 | 16 | |SafeStateAgain| repeated SafeState |
| 17 | -@@ -1107,6 +1110,11 @@ SafeStateAgain Like SafeState but afte | |
| 17 | +@@ -1115,6 +1118,11 @@ SafeStateAgain Like SafeState but afte | |
| 18 | 18 | triggered often, don't do something that takes |
| 19 | 19 | time. |
| 20 | 20 |
| @@ -36,12 +36,12 @@ | ||
| 36 | 36 | + {"SearchHitBottom", EVENT_SEARCHHITBOTTOM}, |
| 37 | 37 | + {"SearchHitTop", EVENT_SEARCHHITTOP}, |
| 38 | 38 | {"SessionLoadPost", EVENT_SESSIONLOADPOST}, |
| 39 | + {"SessionWritePost",EVENT_SESSIONWRITEPOST}, | |
| 39 | 40 | {"ShellCmdPost", EVENT_SHELLCMDPOST}, |
| 40 | - {"ShellFilterPost", EVENT_SHELLFILTERPOST}, | |
| 41 | 41 | diff --git a/src/search.c b/src/search.c |
| 42 | 42 | --- a/src/search.c |
| 43 | 43 | +++ b/src/search.c |
| 44 | -@@ -1097,9 +1097,16 @@ searchit( | |
| 44 | +@@ -1055,9 +1055,16 @@ searchit( | |
| 45 | 45 | * written. |
| 46 | 46 | */ |
| 47 | 47 | if (dir == BACKWARD) // start second loop at the other end |
| @@ -61,12 +61,12 @@ | ||
| 61 | 61 | diff --git a/src/vim.h b/src/vim.h |
| 62 | 62 | --- a/src/vim.h |
| 63 | 63 | +++ b/src/vim.h |
| 64 | -@@ -1378,6 +1378,8 @@ enum auto_event | |
| 64 | +@@ -1410,6 +1410,8 @@ enum auto_event | |
| 65 | 65 | EVENT_REMOTEREPLY, // upon string reception from a remote vim |
| 66 | 66 | EVENT_SAFESTATE, // going to wait for a character |
| 67 | 67 | EVENT_SAFESTATEAGAIN, // still waiting for a character |
| 68 | 68 | + EVENT_SEARCHHITBOTTOM, // hit bottom when searching |
| 69 | 69 | + EVENT_SEARCHHITTOP, // hit top when searching |
| 70 | 70 | EVENT_SESSIONLOADPOST, // after loading a session file |
| 71 | + EVENT_SESSIONWRITEPOST, // after writing a session file | |
| 71 | 72 | EVENT_SHELLCMDPOST, // after ":!cmd" |
| 72 | - EVENT_SHELLFILTERPOST, // after ":1,2!cmd", ":w !cmd", ":r !cmd". |
Fork