Thomas Adam
9a0ce98c54
Merge branch 'obsd-master'
2015-07-06 16:01:10 +01:00
nicm
b298478435
Update environment with -E when attach-session used on an already
...
attached session or switch-client used on the current session. From Cam
Hutchison.
2015-07-06 14:24:57 +00:00
Thomas Adam
78723af99f
README: Clarify SYNCING is under the ISC
2015-06-28 12:01:19 +01:00
Nicholas Marriott
8b8a007e8e
Merge branch 'master' of github.com:tmux/tmux
2015-06-20 08:45:19 +01:00
Nicholas Marriott
8abcea18a2
Remove monitor-content options which have been removed, from Guy Hughes.
2015-06-20 08:43:55 +01:00
Thomas Adam
0ef3e28609
Merge branch 'obsd-master'
2015-06-19 02:01:10 +01:00
nicm
f557c7d8ca
Use the SRCDST define for usage.
2015-06-18 23:56:01 +00:00
nicm
b43b13faf9
Use xsnprintf.
2015-06-18 23:55:24 +00:00
nicm
164ba041c9
Remove a stray : and tweak paragraph.
2015-06-18 23:53:56 +00:00
Thomas Adam
86018a3947
Merge branch 'obsd-master'
2015-06-17 22:01:13 +01:00
nicm
85120b37ea
Change break-pane to take target and source panes (-t and -s) in line
...
with other commands, from Thomas Adam.
2015-06-17 19:56:08 +00:00
Thomas Adam
21a2ccc5f1
Merge branch 'obsd-master'
2015-06-17 20:01:12 +01:00
nicm
84f0622c85
Break cmdq_continue inner loop into a helper function.
2015-06-17 17:02:15 +00:00
Thomas Adam
a584e11d6b
Merge branch 'obsd-master'
2015-06-17 18:01:07 +01:00
nicm
0ff335961e
Move the shuffle code from new-window -a into a function and add a -a
...
flag for move-window too. From Thomas Adam.
2015-06-17 16:50:28 +00:00
nicm
021cdbe1c0
Use an explicit job state instead of avoid closing our side of the
...
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.
2015-06-17 16:44:49 +00:00
Thomas Adam
9fdc3a069a
Merge branch 'obsd-master'
2015-06-15 14:01:09 +01:00
nicm
d96ab34019
Add window_activity format, from Thomas Adam based on a diff originally
...
from propos6 at gmail dot com.
2015-06-15 10:58:01 +00:00
Thomas Adam
37005d04a9
Merge branch 'obsd-master'
2015-06-14 12:01:10 +01:00
nicm
29c29e7717
Add a format for client PID (client_pid) and server PID (pid). Diff for
...
client_pid from Thomas Adam.
2015-06-14 10:07:44 +00:00
Thomas Adam
48a46e066e
Merge branch 'obsd-master'
2015-06-10 16:01:08 +01:00
Nicholas Marriott
ba665e24e3
Merge branch 'master' of github.com:tmux/tmux
2015-06-10 15:41:35 +01:00
Nicholas Marriott
dca084e703
Don't leak dotfd if fchdir fails. From ettl dot martin78 at gmail dot com.
2015-06-10 15:39:23 +01:00
nicm
bbc0898060
wp->tty is a char [] not a char * so it can't be NULL. From Thomas Adam.
2015-06-10 12:56:04 +00:00
Thomas Adam
0ff172fabf
Merge branch 'obsd-master'
2015-06-09 10:01:10 +01:00
nicm
a412dd616f
Fix loop comparison broken in last commit, from Thomas Adam.
2015-06-09 07:07:06 +00:00
Nicholas Marriott
02a848d77c
It isn't supposed to...
2015-06-08 09:46:14 +01:00
Thomas Adam
7acc4addb5
Merge branch 'obsd-master'
...
Conflicts:
client.c
tmux.1
tmux.c
2015-06-07 23:42:25 +01:00
nicm
c4e811e519
Add -E flag when attaching or switching client to bypass
...
update-environment, from Steven Lu.
2015-06-07 21:39:39 +00:00
Nicholas Marriott
a5c55e4393
Update TODO.
2015-06-07 08:36:03 +01:00
nicm
ed6c036ee3
Use ints for the calculations rather than u_char, they could end up
...
signed.
2015-06-05 22:50:27 +00:00
nicm
55b96a5bd5
Handle the RGB colour escape sequence (\033[38;2;<r>;<g>;<b>m and 48;2)
...
like xterm(1) does, by mapping to the nearest in the 256 colour palette.
2015-06-05 22:33:39 +00:00
nicm
1cb073d48e
Use fixed colour tables rather than generated and do a quick search for
...
exact match before doing the distance comparison.
2015-06-05 22:01:17 +00:00
nicm
641a9cd3f5
Similarly, for sessions use a callback to free rather than checking
...
every loop.
2015-06-05 18:18:32 +00:00
nicm
10e90ae01f
Change deref to the more sensible unref, and add a couple I missed before.
2015-06-05 18:06:30 +00:00
nicm
8c93b768e4
Instead of putting dead clients on a list and checking it every loop,
...
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.
2015-06-05 18:01:12 +00:00
nicm
b0782df8a6
Do not use the key variable uninitialized (in a debug log statement),
...
reported by jungleboogie0 at gmail dot com.
2015-06-05 15:10:13 +00:00
Nicholas Marriott
f7598b8a26
Only need *.ch in compat.
2015-06-05 12:44:15 +01:00
nicm
2f586905fc
Fix a warning.
2015-06-05 09:09:08 +00:00
nicm
4219939c10
Make it so that if a window or session target is prefixed with an =,
...
only an exact name or index match is accepted, no special character,
prefix match, or fnmatch.
2015-06-05 08:14:16 +00:00
nicm
6b2129696f
Move the nested check from client to server and compare the client tty
...
name to all the pane pty names instead of comparing socket paths. This
means that "new -d" will work without unsetting $TMUX.
2015-06-04 23:27:51 +00:00
jmc
dc0d34e137
tweak SYNOPSIS and usage();
2015-06-04 20:34:22 +00:00
Thomas Adam
83a70172a4
Merge branch 'obsd-master'
2015-06-04 16:01:07 +01:00
nicm
4a6c06d6a9
Make unsetting a global option restore it to the default. Diff lying
...
around for a while, I have forgotten who suggested it :-/.
2015-06-04 14:29:33 +00:00
Thomas Adam
02e348c069
Merge branch 'obsd-master'
2015-06-04 12:59:41 +01:00
nicm
a863834574
Add support for a single "marked pane". There is one marked pane in the
...
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).
2015-06-04 11:43:51 +00:00
Nicholas Marriott
1de74e27e5
Spaces -> tabs.
2015-06-04 11:40:27 +01:00
Nicholas Marriott
d058e963fd
Update mailmap.
2015-06-04 11:36:44 +01:00
Thomas Adam
13808ccede
Merge branch 'obsd-master'
2015-06-04 11:17:39 +01:00
nicm
a3edfd9e84
teminal -> terminal, from Corey Farwell.
2015-06-04 09:42:29 +00:00
