Commit Graph

6717 Commits

Author SHA1 Message Date
6b60a5c6d6 Update CHANGES. 2017-07-27 23:22:54 +01:00
147740ed40 Merge branch 'obsd-master' 2017-07-27 14:01:13 +01:00
3df7c91f1a Add pane_at_left/right/top/bottom formats, from Amos Bird. 2017-07-27 10:42:05 +00:00
58744de3eb Merge branch 'obsd-master' 2017-07-26 18:01:16 +01:00
b1bd0c7fc1 Always reset the alerts timer so it works even if activity and silence
are enabled on the same window.
2017-07-26 16:16:25 +00:00
76887b1d27 Make bell, activity and silence alerting more consistent:
- remove the bell-on-alert option;

- add activity-action and silence-action options with the same possible
  values as the existing bell-action;

- add "both" value for the visual-bell, visual-activity and
  visual-silence options to trigger both a bell and a message.

This means all three work the same way. Based on changes from Yvain Thonnart.
2017-07-26 16:14:08 +00:00
06a2644ab2 Update CHANGES. 2017-07-26 11:25:33 +01:00
ef9afddd1a Merge branch 'master' of github.com:tmux/tmux 2017-07-26 08:41:45 +01:00
3065b21375 Mention autoconf and automake. 2017-07-26 08:38:37 +01:00
358df10191 Merge branch 'obsd-master' 2017-07-22 02:01:13 +01:00
3bb426d92c Use the actual width written rather than the possible width to clear. 2017-07-21 22:55:45 +00:00
26db50d6df Merge branch 'obsd-master' 2017-07-21 16:01:13 +01:00
8c6ad55320 Trim trailing spaces from full line when it is clearly OK to do so. 2017-07-21 14:25:29 +00:00
e0d49ad758 Allow ispunct() as well as isalnum() when parsing initial window names. 2017-07-21 12:58:02 +00:00
e725b96a59 Merge branch 'obsd-master' 2017-07-21 12:01:16 +01:00
11e2af6df7 Add -c for respawn-pane and respawn-window, from J Raynor. 2017-07-21 09:17:19 +00:00
acbbc93501 Merge branch 'obsd-master' 2017-07-14 22:01:10 +01:00
932f6cfbfc Because ignore SIGCHLD early, letting signal_del restore it doesn't work
correctly, so set it explicitly back to default (and the others for good
measure).
2017-07-14 18:49:07 +00:00
1265e212e4 Merge branch 'obsd-master' 2017-07-14 10:01:11 +01:00
e4cd8751a2 Update CHANGES. 2017-07-14 09:14:23 +01:00
2678fe53f5 Fix redraw defer code in the presence of multiple clients - the timer
may be needed for all of them, so don't delete it on the first; and
don't skip setting the redraw flag if the timer is already running.

Reported by Pol Van Aubel in GitHub issue 1003.
2017-07-14 08:04:23 +00:00
e3698e6e1f Merge branch 'obsd-master' 2017-07-12 16:01:11 +01:00
8b84fc177c Line up keys in tree mode, and don't expand windows with one pane. From
Thomas Adam.
2017-07-12 14:31:06 +00:00
5122f3477f Merge branch 'obsd-master' 2017-07-12 14:01:13 +01:00
1076a2e26c Merge branch 'obsd-master'
Conflicts:
	cmd-pipe-pane.c
	proc.c
	tmux.c
	window.c
2017-07-12 13:43:08 +01:00
fba6140a4a Do not need to set up USR2 twice. 2017-07-12 12:35:31 +00:00
51112221ee Block signals between forking and clearing signal handlers (or calling
event_reinit) - if the child gets a signal and fires the libevent signal
handler during this period it could write a signal into the parent's
signal pipe. GitHub issue 1001 from Aaron van Geffen.
2017-07-12 10:04:51 +00:00
0453ad0146 Move signal code into proc.c. 2017-07-12 09:24:17 +00:00
ed3cfaafb2 Make shell_command a global like other stuff rather than making it an
exception and using callback argument.
2017-07-12 09:21:25 +00:00
d0d42dc4cb proc_send_s now seems unnecessary. 2017-07-12 09:07:52 +00:00
fbbf5a108b Merge branch 'obsd-master' 2017-07-10 00:01:15 +01:00
58b796608f Some extra logging to show why tmux might exit. 2017-07-09 22:33:09 +00:00
05062e7d2d Merge branch 'obsd-master' 2017-07-07 18:01:15 +01:00
bfaa885f10 Fix size of rightmost preview section. 2017-07-07 16:27:26 +00:00
9913cce3ba Add a pane_pipe format to show if pipe-pane is active, GitHub issue 990. 2017-07-07 14:39:45 +00:00
1029f2b277 Merge branch 'obsd-master' 2017-07-07 10:01:09 +01:00
1f7ca973c5 When working out the current client (for example for switch-client with
no target), prefer clients attached to the current session if there is
one. GitHub issue 995 from Jan Larres.
2017-07-07 07:13:14 +00:00
6b1ceca86a Merge branch 'obsd-master' 2017-07-05 00:01:10 +01:00
53d4ed22e8 < and > keys to scroll preview list left and right in tree mode. 2017-07-04 22:21:31 +00:00
feb044bd2d Merge branch 'obsd-master' 2017-07-04 14:01:15 +01:00
bedf8bd437 Handle 0 size of preview box in caller. 2017-07-04 12:26:14 +00:00
6cb4a3bb19 Merge branch 'obsd-master' 2017-07-04 02:01:13 +01:00
4039802fce Change session and window preview so that the current window or pane is
always shown.
2017-07-03 22:48:02 +00:00
5e98770936 Merge branch 'obsd-master' 2017-07-03 16:01:14 +01:00
6ee0afb579 Change previous to not wait for both process exit and pty close -
instead if there is a pipe-pane active, do not exit until all data is
read (including any libevent hasn't seen yet). Fixes problem reported by
Theo Buehler and still seems to solve the original issue.
2017-07-03 12:38:50 +00:00
4e01036cb6 Merge branch 'obsd-master' 2017-07-03 10:01:14 +01:00
28687f2d55 Do not close panes until process has exited and any outstanding data
has been written to the pipe-pane event if there is one. GitHub issue 991.
2017-07-03 08:16:03 +00:00
42285ac989 Try C.UTF-8 which is also a commonly useful locale on some platforms,
from Romain Francoise.
2017-07-03 08:08:30 +00:00
6fba9a39b7 Merge branch 'obsd-master' 2017-07-01 00:01:21 +01:00
fa677fc0e1 Don't write over right border. 2017-06-30 22:37:35 +00:00