Thomas Adam
a568aaa0c0
Merge branch 'obsd-master'
2015-07-28 18:01:08 +01:00
nicm
b254115acd
Tidy up the way terminals are described and move some structs out of tmux.h.
2015-07-28 15:18:10 +00:00
Thomas Adam
ff18787b2c
Merge branch 'obsd-master'
2015-07-27 10:01:08 +01:00
nicm
d33adc4fd0
Make -q suppress ambiguous option warnings too, from Cam Hutchison.
2015-07-27 08:45:45 +00:00
Nicholas Marriott
e4cdc9fa0b
Merge branch 'master' of github.com:tmux/tmux
2015-07-24 09:10:21 +01:00
Nicholas Marriott
669059aa19
Fix a warning, from Kosta Zertsekel.
2015-07-24 09:06:15 +01:00
Thomas Adam
18a64ad52d
Merge branch 'obsd-master'
2015-07-20 18:01:10 +01:00
nicm
92af3766ec
Add an option (history-file) for a file to save/restore command prompt
...
history, from Olof-Joachim Frahm.
2015-07-20 15:50:04 +00:00
Thomas Adam
dedd9edf7f
Merge branch 'obsd-master'
2015-07-20 12:01:07 +01:00
nicm
d4ce210713
Correct the tsl/fsl sequence to ]0 not ]2 (from Marcel Korpel). While
...
here, Xr xterm and remove some advice about elinks that is better
elsewhere.
2015-07-20 10:34:11 +00:00
Nicholas Marriott
e6facdcb0c
Merge branch 'master' of github.com:tmux/tmux
2015-07-19 08:10:07 +01:00
Nicholas Marriott
96dcbe217b
Update tmux.vim from Ben Boeckel.
2015-07-19 08:07:55 +01:00
Thomas Adam
e45f42db29
Merge branch 'obsd-master'
2015-07-17 16:01:07 +01:00
nicm
bad8d0fd20
Do not call window_unzoom from window_destroy because it will try to add
...
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.
2015-07-17 13:09:07 +00:00
Thomas Adam
b886393042
Merge branch 'obsd-master'
2015-07-17 10:01:09 +01:00
nicm
3192178f15
Initialize client fd to -1 as well, from Bobby Powers.
2015-07-17 06:53:47 +00:00
Nicholas Marriott
8c96e2a6d9
Implement osdep_get_name and osdep_get_cwd for AIX, from J Raynor.
2015-07-15 08:46:35 +01:00
Nicholas Marriott
5ffb869e1a
Merge branch 'master' of github.com:tmux/tmux
2015-07-14 08:15:05 +01:00
Nicholas Marriott
bed3069fd7
Add _LINUX_SOURCE_COMPAT on AIX.
2015-07-14 08:14:35 +01:00
Thomas Adam
dcc28434f4
Merge branch 'obsd-master'
2015-07-13 20:01:08 +01:00
nicm
8dcea2cc14
Reset G0/G1 state when resetting everything else with send-keys -R.
2015-07-13 18:45:18 +00:00
nicm
4e637b1b61
Ignore environment variables that are too long to send to the server.
2015-07-13 18:10:26 +00:00
Thomas Adam
07aef38591
Merge branch 'obsd-master'
2015-07-13 18:01:09 +01:00
nicm
e45d624df2
Fix line endings.
2015-07-13 15:51:31 +00:00
nicm
c7374c31c4
Initialize cwd fd to -1 so that we don't close fd 0 if the client is
...
destroyed before it is changed. Also allow ttyname() to fail. Fixes
problems when running out of file descriptors reported by Bruno Sutic.
2015-07-13 15:49:31 +00:00
nicm
81069f66f9
Add a format to show if client is a control client. From Bruno Sutic.
2015-07-13 15:37:26 +00:00
Thomas Adam
38d4d69639
Merge branch 'obsd-master'
2015-07-13 16:01:09 +01:00
nicm
6308c48efd
Add a -s flag to show-environment to output Bourne shell commands a la
...
ssh-agent. Mostly from Cam Hutchison with some changes by me.
2015-07-13 13:36:29 +00:00
nicm
cc768d77ec
Revert to marking lines as wrapped on newlines, fixes problems with
...
capturep -J.
2015-07-13 13:28:50 +00:00
Nicholas Marriott
73f9f0334c
Check for flock in libbsd for AIX, and remove some getopt.h includes. From J
...
Raynor.
2015-07-13 14:19:50 +01:00
Nicholas Marriott
28c33f67bc
Merge branch 'master' of github.com:tmux/tmux
2015-07-12 19:47:47 +01:00
Nicholas Marriott
235e0bd65a
Update imsg*.[ch] from OpenBSD, including bzero->memset.
2015-07-12 19:46:58 +01:00
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
