aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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.
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-07-12
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-07-06
| |\|
| | * Update environment with -E when attach-session used on an alreadynicm2015-07-06
| | | | | | | | | | | | | | | attached session or switch-client used on the current session. From Cam Hutchison.
| * | README: Clarify SYNCING is under the ISCThomas Adam2015-06-28
| | |
* | | Update imsg*.[ch] from OpenBSD, including bzero->memset.Nicholas Marriott2015-07-12
|/ /
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-06-20
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-06-19
| |\|
| | * Use the SRCDST define for usage.nicm2015-06-18
| | |
| | * Use xsnprintf.nicm2015-06-18
| | |
| | * Remove a stray : and tweak paragraph.nicm2015-06-18
| | |
| * | Merge branch 'obsd-master'Thomas Adam2015-06-17
| |\|
| | * Change break-pane to take target and source panes (-t and -s) in linenicm2015-06-17
| | | | | | | | | | | | with other commands, from Thomas Adam.
| * | Merge branch 'obsd-master'Thomas Adam2015-06-17
| |\|
| | * Break cmdq_continue inner loop into a helper function.nicm2015-06-17
| | |
| | * Move the shuffle code from new-window -a into a function and add a -anicm2015-06-17
| | | | | | | | | | | | flag for move-window too. From Thomas Adam.
| * | Merge branch 'obsd-master'Thomas Adam2015-06-17
| |\|
| | * Use an explicit job state instead of avoid closing our side of thenicm2015-06-17
| | | | | | | | | | | | | | | | | | | | | socketpair and setting it to -1 to mark when the other side is closed. This avoids closing it while the libevent bufferevent still has it (it could try to add it to the polled set which some mechanisms don't like). Fixes part a problem reported by Bruno Sutic.
| * | Merge branch 'obsd-master'Thomas Adam2015-06-15
| |\|
| | * Add window_activity format, from Thomas Adam based on a diff originallynicm2015-06-15
| | | | | | | | | | | | from propos6 at gmail dot com.
| * | Merge branch 'obsd-master'Thomas Adam2015-06-14
| |\|
| | * Add a format for client PID (client_pid) and server PID (pid). Diff fornicm2015-06-14
| | | | | | | | | | | | client_pid from Thomas Adam.
| * | Merge branch 'obsd-master'Thomas Adam2015-06-10
| |\|
| | * wp->tty is a char [] not a char * so it can't be NULL. From Thomas Adam.nicm2015-06-10
| | |
* | | Remove monitor-content options which have been removed, from Guy Hughes.Nicholas Marriott2015-06-20
|/ /
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2015-06-10
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2015-06-09
| |\|
| | * Fix loop comparison broken in last commit, from Thomas Adam.nicm2015-06-09
| | |
* | | Don't leak dotfd if fchdir fails. From ettl dot martin78 at gmail dot com.Nicholas Marriott2015-06-10
| | |
* | | It isn't supposed to...Nicholas Marriott2015-06-08
|/ /
* | Merge branch 'obsd-master'Thomas Adam2015-06-07
|\| | | | | | | | | | | | | Conflicts: client.c tmux.1 tmux.c
| * Add -E flag when attaching or switching client to bypassnicm2015-06-07
| | | | | | | | update-environment, from Steven Lu.
| * Use ints for the calculations rather than u_char, they could end upnicm2015-06-05
| | | | | | | | signed.
| * Handle the RGB colour escape sequence (\033[38;2;<r>;<g>;<b>m and 48;2)nicm2015-06-05
| | | | | | | | like xterm(1) does, by mapping to the nearest in the 256 colour palette.
| * Use fixed colour tables rather than generated and do a quick search fornicm2015-06-05
| | | | | | | | exact match before doing the distance comparison.
| * Similarly, for sessions use a callback to free rather than checkingnicm2015-06-05
| | | | | | | | every loop.
| * Change deref to the more sensible unref, and add a couple I missed before.nicm2015-06-05
| |