aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge branch 'obsd-master'Thomas Adam2017-08-09
|\| | | | | | | | | Conflicts: tmux.1
| * Add -F to choose-tree, choose-client, choose-buffer to specify thenicm2017-08-09
| | | | | | | | | | format of each line, as well as adding a couple of formats needed for the default display.
* | Update CHANGES and TODO.Nicholas Marriott2017-08-09
| |
* | Merge branch 'obsd-master'Thomas Adam2017-08-08
|\|
| * Hooks for after-select-pane and after-select-window.nicm2017-08-08
| |
* | Merge branch 'obsd-master'Thomas Adam2017-08-02
|\|
| * Add selection_present format so commands in copy mode can use it, GitHubnicm2017-08-02
| | | | | | | | issue 1028.
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2017-07-28
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2017-07-28
| |\|
| | * Show pane title in window list for windows with only one pane.nicm2017-07-28
| | |
* | | I already mentioned these... revert previous.Nicholas Marriott2017-07-28
|/ /
* | This is a big meaningless.Nicholas Marriott2017-07-27
| |
* | Update CHANGES.Nicholas Marriott2017-07-27
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-27
|\|
| * Add pane_at_left/right/top/bottom formats, from Amos Bird.nicm2017-07-27
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-26
|\|
| * Always reset the alerts timer so it works even if activity and silencenicm2017-07-26
| | | | | | | | are enabled on the same window.
| * Make bell, activity and silence alerting more consistent:nicm2017-07-26
| | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | Update CHANGES.Nicholas Marriott2017-07-26
| |
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2017-07-26
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2017-07-22
| |\|
| | * Use the actual width written rather than the possible width to clear.nicm2017-07-21
| | |
| * | Merge branch 'obsd-master'Thomas Adam2017-07-21
| |\|
| | * Trim trailing spaces from full line when it is clearly OK to do so.nicm2017-07-21
| | |
| | * Allow ispunct() as well as isalnum() when parsing initial window names.nicm2017-07-21
| | |
* | | Mention autoconf and automake.Nicholas Marriott2017-07-26
|/ /
* | Merge branch 'obsd-master'Thomas Adam2017-07-21
|\|
| * Add -c for respawn-pane and respawn-window, from J Raynor.nicm2017-07-21
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-14
|\|
| * Because ignore SIGCHLD early, letting signal_del restore it doesn't worknicm2017-07-14
| | | | | | | | | | correctly, so set it explicitly back to default (and the others for good measure).
* | Merge branch 'obsd-master'Thomas Adam2017-07-14
|\|
| * Fix redraw defer code in the presence of multiple clients - the timernicm2017-07-14
| | | | | | | | | | | | | | 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.
* | Update CHANGES.Nicholas Marriott2017-07-14
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-12
|\|
| * Line up keys in tree mode, and don't expand windows with one pane. Fromnicm2017-07-12
| | | | | | | | Thomas Adam.
* | Merge branch 'obsd-master'Thomas Adam2017-07-12
|\|
| * Do not need to set up USR2 twice.nicm2017-07-12
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-12
|\| | | | | | | | | | | | | | | Conflicts: cmd-pipe-pane.c proc.c tmux.c window.c
| * Block signals between forking and clearing signal handlers (or callingnicm2017-07-12
| | | | | | | | | | | | 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.
| * Move signal code into proc.c.nicm2017-07-12
| |
| * Make shell_command a global like other stuff rather than making it annicm2017-07-12
| | | | | | | | exception and using callback argument.
| * proc_send_s now seems unnecessary.nicm2017-07-12
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-10
|\|
| * Some extra logging to show why tmux might exit.nicm2017-07-09
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-07
|\|
| * Fix size of rightmost preview section.nicm2017-07-07
| |
| * Add a pane_pipe format to show if pipe-pane is active, GitHub issue 990.nicm2017-07-07
| |
* | Merge branch 'obsd-master'Thomas Adam2017-07-07
|\|
| * When working out the current client (for example for switch-client withnicm2017-07-07
| | | | | | | | | | no target), prefer clients attached to the current session if there is one. GitHub issue 995 from Jan Larres.
* | Merge branch 'obsd-master'Thomas Adam2017-07-05
|\|