aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge branch 'obsd-master'Thomas Adam2015-08-28
|\|
| * Allow environment variables in #{}.nicm2015-08-28
| |
* | Merge branch 'obsd-master'Thomas Adam2015-08-28
|\|
| * Error messages should not have a trailing period.nicm2015-08-28
| |
| * Only do the automatic-rename dance if the pane has changed (seen output,nicm2015-08-28
| | | | | | | | or new active pane).
* | Merge branch 'obsd-master'Thomas Adam2015-08-25
|\|
| * When searching for tabs, start from screen width, fixes out-of-boundsnicm2015-08-25
| | | | | | | | read found by Kuang-che Wu.
* | Merge branch 'obsd-master'Thomas Adam2015-08-25
|\|
| * In grid_duplicate_lines, if the line is empty (cellsize == 0) then clearnicm2015-08-24
| | | | | | | | | | | | the destination celldata pointer rather than leaving a stale copy of the source pointer (which may later be freed). Fixes a crash found by Kuang-che Wu.
* | Merge branch 'obsd-master'Thomas Adam2015-08-16
|\|
| * Come out of copy mode when history is cleared.nicm2015-08-16
| |
* | Handle \ at EOL from Daniel Hahler.Nicholas Marriott2015-08-15
| |
* | Merge branch 'obsd-master'Thomas Adam2015-08-13
|\|
| * right-up should be right-of, also rename the values too.nicm2015-08-13
| |
* | Merge branch 'obsd-master'Thomas Adam2015-08-12
|\|
| * Rename left/right/up/down relative to active pane to add -of suffixnicm2015-08-12
| | | | | | | | | | (left-of/right-of/etc) to remove conflict with left/right meaning leftmost or rightmost pane. From Ben Boeckel.
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-08-07
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-07-29
| |\|
| | * status_out and associated data structures are no longer used.nicm2015-07-29
| | |
| * | Merge branch 'obsd-master'Thomas Adam2015-07-28
| |\|
| | * Tidy up the way terminals are described and move some structs out of tmux.h.nicm2015-07-28
| | |
| * | Merge branch 'obsd-master'Thomas Adam2015-07-27
| |\|
| | * Make -q suppress ambiguous option warnings too, from Cam Hutchison.nicm2015-07-27
| | |
* | | +history-file, from Ben Boeckel.Nicholas Marriott2015-08-07
|/ /
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-07-24
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-07-20
| |\|
| | * Add an option (history-file) for a file to save/restore command promptnicm2015-07-20
| | | | | | | | | | | | history, from Olof-Joachim Frahm.
| * | Merge branch 'obsd-master'Thomas Adam2015-07-20
| |\|
| | * Correct the tsl/fsl sequence to ]0 not ]2 (from Marcel Korpel). Whilenicm2015-07-20
| | | | | | | | | | | | | | | here, Xr xterm and remove some advice about elinks that is better elsewhere.
* | | Fix a warning, from Kosta Zertsekel.Nicholas Marriott2015-07-24
| | |
* | | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-07-19
|\| |
| * | Merge branch 'obsd-master'Thomas Adam2015-07-17
| |\|
| | * Do not call window_unzoom from window_destroy because it will try to addnicm2015-07-17
| | | | | | | | | | | | | | | | | | | | | a notification which will get confused because the reference count is already zero and end up back in window_destroy and a double free. Instead, just destroy the layouts directly. Noticed by Thomas Adam.
| * | Merge branch 'obsd-master'Thomas Adam2015-07-17
| |\|
| | * Initialize client fd to -1 as well, from Bobby Powers.nicm2015-07-17
| | |
* | | Update tmux.vim from Ben Boeckel.Nicholas Marriott2015-07-19
|/ /
* | Implement osdep_get_name and osdep_get_cwd for AIX, from J Raynor.Nicholas Marriott2015-07-15
| |
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-07-14
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-07-13
| |\|
| | * Reset G0/G1 state when resetting everything else with send-keys -R.nicm2015-07-13
| | |
| | * Ignore environment variables that are too long to send to the server.nicm2015-07-13
| | |
| * | Merge branch 'obsd-master'Thomas Adam2015-07-13
| |\|
| | * Fix line endings.nicm2015-07-13
| | |
| | * Initialize cwd fd to -1 so that we don't close fd 0 if the client isnicm2015-07-13
| | | | | | | | | | | | | | | destroyed before it is changed. Also allow ttyname() to fail. Fixes problems when running out of file descriptors reported by Bruno Sutic.
| | * Add a format to show if client is a control client. From Bruno Sutic.nicm2015-07-13
| | |
| * | Merge branch 'obsd-master'Thomas Adam2015-07-13
| |\|
| | * Add a -s flag to show-environment to output Bourne shell commands a lanicm2015-07-13
| | | | | | | | | | | | ssh-agent. Mostly from Cam Hutchison with some changes by me.
| | * Revert to marking lines as wrapped on newlines, fixes problems withnicm2015-07-13
| | | | | | | | | | | | capturep -J.
* | | Add _LINUX_SOURCE_COMPAT on AIX.Nicholas Marriott2015-07-14
|/ /
* | Check for flock in libbsd for AIX, and remove some getopt.h includes. From JNicholas Marriott2015-07-13
| | | | | | | | Raynor.