aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| |
| * Instead of putting dead clients on a list and checking it every loop,nicm2015-06-05
| | | | | | | | | | | | | | use event_once to queue a callback to deal with them. Also dead clients with references would never actually be freed because the wrap-up functions (the callback for stdin, or status_prompt_clear) would never be called. So call them in server_client_lost.
| * Do not use the key variable uninitialized (in a debug log statement),nicm2015-06-05
| | | | | | | | reported by jungleboogie0 at gmail dot com.
| * Fix a warning.nicm2015-06-05
| |
| * Make it so that if a window or session target is prefixed with an =,nicm2015-06-05
| | | | | | | | | | only an exact name or index match is accepted, no special character, prefix match, or fnmatch.
| * Move the nested check from client to server and compare the client ttynicm2015-06-04
| | | | | | | | | | name to all the pane pty names instead of comparing socket paths. This means that "new -d" will work without unsetting $TMUX.
| * tweak SYNOPSIS and usage();jmc2015-06-04
| |
* | Update TODO.Nicholas Marriott2015-06-07
| |
* | Only need *.ch in compat.Nicholas Marriott2015-06-05
| |
* | Merge branch 'obsd-master'Thomas Adam2015-06-04
|\|
| * Make unsetting a global option restore it to the default. Diff lyingnicm2015-06-04
| | | | | | | | around for a while, I have forgotten who suggested it :-/.
* | Merge branch 'obsd-master'Thomas Adam2015-06-04
|\|
| * Add support for a single "marked pane". There is one marked pane in thenicm2015-06-04
| | | | | | | | | | | | | | | | | | server at a time; it may be toggled or cleared with select-pane -m and -M (the border is highlighted). A new target '~' or '{marked}' specifies the marked pane to commands and it is the default target for the swap-pane and join-pane -s flag (this makes them much simpler to use - mark the source pane and then change to the target pane to run swapp or joinp).
* | Spaces -> tabs.Nicholas Marriott2015-06-04
| |
* | Update mailmap.Nicholas Marriott2015-06-04
| |