diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-09 13:41:59 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-09 13:41:59 +0100 |
| commit | 9e0e860031fa4a08593cab17ea4796393b5cb149 (patch) | |
| tree | c8e7a0cc211e3cf8883ddfed7e7068aeef07854d | |
| parent | 6a2f32b4fdb5bdea21594f1305b4c96e9e1bf46d (diff) | |
| parent | ff135b34a41b388b9ac98e2f655cf487ace6aa43 (diff) | |
| download | rtmux-9e0e860031fa4a08593cab17ea4796393b5cb149.tar.gz rtmux-9e0e860031fa4a08593cab17ea4796393b5cb149.tar.bz2 rtmux-9e0e860031fa4a08593cab17ea4796393b5cb149.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-display-menu.c | 6 | ||||
| -rw-r--r-- | tmux.1 | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/cmd-display-menu.c b/cmd-display-menu.c index 852c540e..b4db7331 100644 --- a/cmd-display-menu.c +++ b/cmd-display-menu.c @@ -190,7 +190,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_NORMAL); 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 title = xstrdup(""); @@ -298,13 +298,13 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item) value = args_get(args, 'd'); 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 cwd = xstrdup(server_client_get_cwd(c, fs->s)); value = args_get(args, 'R'); 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')) flags |= POPUP_WRITEKEYS; @@ -1425,6 +1425,10 @@ This mode is entered with the command, bound to .Ql \&[ by default. +Copied text can be pasted with the +.Ic paste-buffer +command, bound to +.Ql \&] . .It View mode, which is like copy mode but is entered when a command that produces output, such as |