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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2020-04-06 04:01:42 +01:00
commit 71ab50eddd
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd-list-keys.c
View File

@ -47,8 +47,8 @@ const struct cmd_entry cmd_list_commands_entry = {
.name = "list-commands", .name = "list-commands",
.alias = "lscm", .alias = "lscm",
.args = { "F:", 0, 0 }, .args = { "F:", 0, 1 },
.usage = "[-F format]", .usage = "[-F format] [command]",
.flags = CMD_STARTSERVER|CMD_AFTERHOOK, .flags = CMD_STARTSERVER|CMD_AFTERHOOK,
.exec = cmd_list_keys_exec .exec = cmd_list_keys_exec
@ -317,9 +317,12 @@ cmd_list_keys_commands(struct cmd *self, struct cmdq_item *item)
const struct cmd_entry **entryp; const struct cmd_entry **entryp;
const struct cmd_entry *entry; const struct cmd_entry *entry;
struct format_tree *ft; struct format_tree *ft;
const char *template, *s; const char *template, *s, *command = NULL;
char *line; char *line;
if (args->argc != 0)
command = args->argv[0];
if ((template = args_get(args, 'F')) == NULL) { if ((template = args_get(args, 'F')) == NULL) {
template = "#{command_list_name}" template = "#{command_list_name}"
"#{?command_list_alias, (#{command_list_alias}),} " "#{?command_list_alias, (#{command_list_alias}),} "
@ -331,6 +334,11 @@ cmd_list_keys_commands(struct cmd *self, struct cmdq_item *item)
for (entryp = cmd_table; *entryp != NULL; entryp++) { for (entryp = cmd_table; *entryp != NULL; entryp++) {
entry = *entryp; entry = *entryp;
if (command != NULL &&
(strcmp(entry->name, command) != 0 &&
(entry->alias == NULL ||
strcmp(entry->alias, command) != 0)))
continue;
format_add(ft, "command_list_name", "%s", entry->name); format_add(ft, "command_list_name", "%s", entry->name);
if (entry->alias != NULL) if (entry->alias != NULL)

2
cmd-new-session.c
View File

@ -334,7 +334,7 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(args, 'P')) { if (args_has(args, 'P')) {
if ((template = args_get(args, 'F')) == NULL) if ((template = args_get(args, 'F')) == NULL)
template = NEW_SESSION_TEMPLATE; template = NEW_SESSION_TEMPLATE;
cp = format_single(item, template, c, s, NULL, NULL); cp = format_single(item, template, c, s, s->curw, NULL);
cmdq_print(item, "%s", cp); cmdq_print(item, "%s", cp);
free(cp); free(cp);
} }

3
cmd-new-window.c
View File

@ -108,7 +108,8 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(args, 'P')) { if (args_has(args, 'P')) {
if ((template = args_get(args, 'F')) == NULL) if ((template = args_get(args, 'F')) == NULL)
template = NEW_WINDOW_TEMPLATE; template = NEW_WINDOW_TEMPLATE;
cp = format_single(item, template, c, s, new_wl, NULL); cp = format_single(item, template, c, s, new_wl,
new_wl->window->active);
cmdq_print(item, "%s", cp); cmdq_print(item, "%s", cp);
free(cp); free(cp);
} }

8
cmd-queue.c
View File

@ -59,10 +59,6 @@ cmdq_append(struct client *c, struct cmdq_item *item)
struct cmdq_list *queue = cmdq_get(c); struct cmdq_list *queue = cmdq_get(c);
struct cmdq_item *next; struct cmdq_item *next;
TAILQ_FOREACH(next, queue, entry) {
log_debug("%s %s: queue %s (%u)", __func__, cmdq_name(c),
next->name, next->group);
}
do { do {
next = item->next; next = item->next;
item->next = NULL; item->next = NULL;
@ -88,10 +84,6 @@ cmdq_insert_after(struct cmdq_item *after, struct cmdq_item *item)
struct cmdq_list *queue = after->queue; struct cmdq_list *queue = after->queue;
struct cmdq_item *next; struct cmdq_item *next;
TAILQ_FOREACH(next, queue, entry) {
log_debug("%s %s: queue %s (%u)", __func__, cmdq_name(c),
next->name, next->group);
}
do { do {
next = item->next; next = item->next;
item->next = after->next; item->next = after->next;

7
tmux.1
View File

@ -1048,9 +1048,12 @@ If
is specified, list only clients connected to that session. is specified, list only clients connected to that session.
.It Xo Ic list-commands .It Xo Ic list-commands
.Op Fl F Ar format .Op Fl F Ar format
.Op Ar command
.Xc .Xc
.D1 (alias: Ic lscm ) .D1 (alias: Ic lscm )
List the syntax of all commands supported by List the syntax of
.Ar command
or - if omitted - of all commands supported by
.Nm . .Nm .
.It Ic list-sessions Op Fl F Ar format .It Ic list-sessions Op Fl F Ar format
.D1 (alias: Ic ls ) .D1 (alias: Ic ls )
@ -2731,7 +2734,7 @@ command.
.It Xo Ic list-keys .It Xo Ic list-keys
.Op Fl 1aN .Op Fl 1aN
.Op Fl P Ar prefix-string Fl T Ar key-table .Op Fl P Ar prefix-string Fl T Ar key-table
.Op key .Op Ar key
.Xc .Xc
.D1 (alias: Ic lsk ) .D1 (alias: Ic lsk )
List key bindings. List key bindings.

7
window-copy.c
View File

@ -2825,11 +2825,8 @@ window_copy_search_marks(struct window_mode_entry *wme, struct screen *ssp,
} }
} }
time(&tstart); time(&tstart);
py = gd->hsize - data->oy; for (py = gd->hsize - data->oy; py > 0; py--) {
if (py > 0) gl = grid_peek_line(gd, py - 1);
py--;
for (; py > 0; py--) {
gl = grid_peek_line(gd, py);
if (~gl->flags & GRID_LINE_WRAPPED) if (~gl->flags & GRID_LINE_WRAPPED)
break; break;
} }