circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-13 14:58:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2022-02-01 14:01:11 +00:00
commit 1b7afd5129
3 changed files with 10 additions and 3 deletions

3
job.c
View File

@ -87,9 +87,8 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e, struct sessio
* if-shell to decide on default-terminal based on outside TERM. * if-shell to decide on default-terminal based on outside TERM.
*/ */
env = environ_for_session(s, !cfg_finished); env = environ_for_session(s, !cfg_finished);
if (e != NULL) { if (e != NULL)
environ_copy(e, env); environ_copy(e, env);
}
sigfillset(&set); sigfillset(&set);
sigprocmask(SIG_BLOCK, &set, &oldset); sigprocmask(SIG_BLOCK, &set, &oldset);

2
menu.c
View File

@ -81,6 +81,8 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
menu->count--; menu->count--;
return; return;
} }
if (c->tty.sx <= 4)
return;
max_width = c->tty.sx - 4; max_width = c->tty.sx - 4;
slen = strlen(s); slen = strlen(s);

8
tmux.1
View File

@ -4992,7 +4992,9 @@ commands to finish; instead, the previous result from running the same command i
or a placeholder if the command has not been run before. or a placeholder if the command has not been run before.
If the command hasn't exited, the most recent line of output will be used, but the status If the command hasn't exited, the most recent line of output will be used, but the status
line will not be updated more than once a second. line will not be updated more than once a second.
Commands are executed with the Commands are executed using
.Pa /bin/sh
and with the
.Nm .Nm
global environment set (see the global environment set (see the
.Sx GLOBAL AND SESSION ENVIRONMENT .Sx GLOBAL AND SESSION ENVIRONMENT
@ -6158,6 +6160,8 @@ Execute the first
.Ar command .Ar command
if if
.Ar shell-command .Ar shell-command
(run with
.Pa /bin/sh )
returns success or the second returns success or the second
.Ar command .Ar command
otherwise. otherwise.
@ -6194,6 +6198,8 @@ option.
.D1 Pq alias: Ic run .D1 Pq alias: Ic run
Execute Execute
.Ar shell-command .Ar shell-command
using
.Pa /bin/sh
or (with or (with
.Fl C ) .Fl C )
a a