circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 19:39:04 +00:00
Code Issues Projects Releases Wiki Activity

Default to previous search string for search-forward and

Browse Source 
search-backward, from Leah Neukirchen.
This commit is contained in:
nicm 2019-08-14 10:02:24 +00:00
parent 0f243f0388
commit 21fae50089
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
window-copy.c
View File

@ -1635,12 +1635,17 @@ window_copy_cmd_search_backward(struct window_copy_cmd_state *cs)
struct window_mode_entry *wme = cs->wme; struct window_mode_entry *wme = cs->wme;
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
u_int np = wme->prefix; u_int np = wme->prefix;
const char *argument = cs->args->argv[1]; const char *argument;
if (*argument != '\0') { if (cs->args->argc == 2) {
argument = cs->args->argv[1];
if (*argument != '\0') {
free(data->searchstr);
data->searchstr = xstrdup(argument);
}
}
if (data->searchstr != NULL) {
data->searchtype = WINDOW_COPY_SEARCHUP; data->searchtype = WINDOW_COPY_SEARCHUP;
free(data->searchstr);
data->searchstr = xstrdup(argument);
for (; np != 0; np--) for (; np != 0; np--)
window_copy_search_up(wme); window_copy_search_up(wme);
} }
@ -1653,12 +1658,17 @@ window_copy_cmd_search_forward(struct window_copy_cmd_state *cs)
struct window_mode_entry *wme = cs->wme; struct window_mode_entry *wme = cs->wme;
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
u_int np = wme->prefix; u_int np = wme->prefix;
const char *argument = cs->args->argv[1]; const char *argument;
if (*argument != '\0') { if (cs->args->argc == 2) {
argument = cs->args->argv[1];
if (*argument != '\0') {
free(data->searchstr);
data->searchstr = xstrdup(argument);
}
}
if (data->searchstr != NULL) {
data->searchtype = WINDOW_COPY_SEARCHDOWN; data->searchtype = WINDOW_COPY_SEARCHDOWN;
free(data->searchstr);
data->searchstr = xstrdup(argument);
for (; np != 0; np--) for (; np != 0; np--)
window_copy_search_down(wme); window_copy_search_down(wme);
} }
@ -1872,11 +1882,11 @@ static const struct {
window_copy_cmd_scroll_up }, window_copy_cmd_scroll_up },
{ "search-again", 0, 0, { "search-again", 0, 0,
window_copy_cmd_search_again }, window_copy_cmd_search_again },
{ "search-backward", 1, 1, { "search-backward", 0, 1,
window_copy_cmd_search_backward }, window_copy_cmd_search_backward },
{ "search-backward-incremental", 1, 1, { "search-backward-incremental", 1, 1,
window_copy_cmd_search_backward_incremental }, window_copy_cmd_search_backward_incremental },
{ "search-forward", 1, 1, { "search-forward", 0, 1,
window_copy_cmd_search_forward }, window_copy_cmd_search_forward },
{ "search-forward-incremental", 1, 1, { "search-forward-incremental", 1, 1,
window_copy_cmd_search_forward_incremental }, window_copy_cmd_search_forward_incremental },