circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-07 09:08:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2020-04-09 13:41:59 +01:00
commit 9e0e860031
2 changed files with 7 additions and 3 deletions

6
cmd-display-menu.c
View File

@ -190,7 +190,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
if (args_has(args, 'T')) if (args_has(args, 'T'))
title = format_single(NULL, args_get(args, 'T'), c, s, wl, wp); title = format_single(item, args_get(args, 'T'), c, s, wl, wp);
else else
title = xstrdup(""); title = xstrdup("");
@ -298,13 +298,13 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
value = args_get(args, 'd'); value = args_get(args, 'd');
if (value != NULL) if (value != NULL)
cwd = format_single(NULL, value, c, fs->s, fs->wl, fs->wp); cwd = format_single(item, value, c, fs->s, fs->wl, fs->wp);
else else
cwd = xstrdup(server_client_get_cwd(c, fs->s)); cwd = xstrdup(server_client_get_cwd(c, fs->s));
value = args_get(args, 'R'); value = args_get(args, 'R');
if (value != NULL) if (value != NULL)
shellcmd = format_single(NULL, value, c, fs->s, fs->wl, fs->wp); shellcmd = format_single(item, value, c, fs->s, fs->wl, fs->wp);
if (args_has(args, 'K')) if (args_has(args, 'K'))
flags |= POPUP_WRITEKEYS; flags |= POPUP_WRITEKEYS;

4
tmux.1
View File

@ -1425,6 +1425,10 @@ This mode is entered with the
command, bound to command, bound to
.Ql \&[ .Ql \&[
by default. by default.
Copied text can be pasted with the
.Ic paste-buffer
command, bound to
.Ql \&] .
.It .It
View mode, which is like copy mode but is entered when a command that produces View mode, which is like copy mode but is entered when a command that produces
output, such as output, such as