Thomas Adam
730312e60f
Merge branch 'obsd-master'
2017-08-22 00:01:10 +01:00
nicm
bbe9da063e
Same as previous for \r alone.
2017-08-21 21:02:58 +00:00
nicm
7ec2a2b9ce
Do not emit \r\n to move to column 0 if there are margins, because it
...
will instead move to the margin left.
2017-08-21 21:01:21 +00:00
Thomas Adam
ccdc369025
Merge branch 'obsd-master'
2017-08-20 00:01:22 +01:00
nicm
768740ae98
Fix example for user-keys.
2017-08-19 20:40:16 +00:00
Thomas Adam
07a13697e1
Merge branch 'obsd-master'
2017-08-17 12:01:17 +01:00
nicm
8daa1d5f54
Add monitor-bell window option to match the activity and silence
...
options, from Brad Town.
2017-08-17 08:37:38 +00:00
Nicholas Marriott
de86bf1856
Add to CHANGES.
2017-08-16 16:23:58 +01:00
Thomas Adam
2103a09430
Merge branch 'obsd-master'
2017-08-16 14:01:15 +01:00
nicm
c6a8ad23a1
Add -d flag to display-panes to specify timeout, and make 0 mean no
...
timeout. From Laurens Post.
2017-08-16 12:12:54 +00:00
nicm
c1ec28a34b
Rename BELL_* values to ALERT_* now they are used by more than bells,
...
based on a diff from Brad Town.
2017-08-16 11:46:08 +00:00
Thomas Adam
0824850bbc
Merge branch 'obsd-master'
2017-08-09 16:01:10 +01:00
Thomas Adam
27c3852103
Merge branch 'obsd-master'
...
Conflicts:
tmux.1
2017-08-09 15:07:18 +01:00
nicm
ac2ba0961b
Fix filtering so it works after the change to only show windows if they
...
have multiple panes.
2017-08-09 13:44:36 +00:00
Nicholas Marriott
237b7a50f4
Update CHANGES and TODO.
2017-08-09 12:48:54 +01:00
nicm
5dd5543fe4
Add -F to choose-tree, choose-client, choose-buffer to specify the
...
format of each line, as well as adding a couple of formats needed for
the default display.
2017-08-09 11:43:45 +00:00
Thomas Adam
4bb5bb9450
Merge branch 'obsd-master'
2017-08-08 12:01:15 +01:00
nicm
31b06571aa
Hooks for after-select-pane and after-select-window.
2017-08-08 09:21:20 +00:00
Thomas Adam
e7b1e05bbd
Merge branch 'obsd-master'
2017-08-02 14:01:10 +01:00
nicm
6f9b9655d7
Add selection_present format so commands in copy mode can use it, GitHub
...
issue 1028.
2017-08-02 11:10:48 +00:00
Nicholas Marriott
45ee118b26
Merge branch 'master' of github.com:tmux/tmux
2017-07-28 15:14:35 +01:00
Nicholas Marriott
0d6fc7eb1e
I already mentioned these... revert previous.
2017-07-28 15:14:01 +01:00
Thomas Adam
ed8ddf2449
Merge branch 'obsd-master'
2017-07-28 14:01:13 +01:00
nicm
b4c9f6edba
Show pane title in window list for windows with only one pane.
2017-07-28 10:59:58 +00:00
Nicholas Marriott
a704f57971
This is a big meaningless.
2017-07-27 23:25:39 +01:00
Nicholas Marriott
6b60a5c6d6
Update CHANGES.
2017-07-27 23:22:54 +01:00
Thomas Adam
147740ed40
Merge branch 'obsd-master'
2017-07-27 14:01:13 +01:00
nicm
3df7c91f1a
Add pane_at_left/right/top/bottom formats, from Amos Bird.
2017-07-27 10:42:05 +00:00
Thomas Adam
58744de3eb
Merge branch 'obsd-master'
2017-07-26 18:01:16 +01:00
nicm
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
nicm
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
Nicholas Marriott
06a2644ab2
Update CHANGES.
2017-07-26 11:25:33 +01:00
Nicholas Marriott
ef9afddd1a
Merge branch 'master' of github.com:tmux/tmux
2017-07-26 08:41:45 +01:00
Nicholas Marriott
3065b21375
Mention autoconf and automake.
2017-07-26 08:38:37 +01:00
Thomas Adam
358df10191
Merge branch 'obsd-master'
2017-07-22 02:01:13 +01:00
nicm
3bb426d92c
Use the actual width written rather than the possible width to clear.
2017-07-21 22:55:45 +00:00
Thomas Adam
26db50d6df
Merge branch 'obsd-master'
2017-07-21 16:01:13 +01:00
nicm
8c6ad55320
Trim trailing spaces from full line when it is clearly OK to do so.
2017-07-21 14:25:29 +00:00
nicm
e0d49ad758
Allow ispunct() as well as isalnum() when parsing initial window names.
2017-07-21 12:58:02 +00:00
Thomas Adam
e725b96a59
Merge branch 'obsd-master'
2017-07-21 12:01:16 +01:00
nicm
11e2af6df7
Add -c for respawn-pane and respawn-window, from J Raynor.
2017-07-21 09:17:19 +00:00
Thomas Adam
acbbc93501
Merge branch 'obsd-master'
2017-07-14 22:01:10 +01:00
nicm
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
Thomas Adam
1265e212e4
Merge branch 'obsd-master'
2017-07-14 10:01:11 +01:00
Nicholas Marriott
e4cd8751a2
Update CHANGES.
2017-07-14 09:14:23 +01:00
nicm
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
Thomas Adam
e3698e6e1f
Merge branch 'obsd-master'
2017-07-12 16:01:11 +01:00
nicm
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
Thomas Adam
5122f3477f
Merge branch 'obsd-master'
2017-07-12 14:01:13 +01:00
Thomas Adam
1076a2e26c
Merge branch 'obsd-master'
...
Conflicts:
cmd-pipe-pane.c
proc.c
tmux.c
window.c
2017-07-12 13:43:08 +01:00
