Commit Graph

4484 Commits

Author SHA1 Message Date
Nicholas Marriott
907ad00300 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
	Makefile.am
2013-05-15 16:50:15 +01:00
Nicholas Marriott
5b1cf02f2e Rename tmux.1.in back to tmux.1 and generate tmux.1.{mdoc,man} instead. 2013-05-15 16:27:30 +01:00
Nicholas Marriott
fce095665c Use $(srcdir) for generating tmux.1, reported by fasta_ on IRC. 2013-04-28 15:37:02 +01:00
Nicholas Marriott
ce52e45d44 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2013-04-24 11:00:32 +01:00
Nicholas Marriott
4f3c31a6b6 Use sysconfdir for the location of global tmux.conf (but default it to /etc),
based on changes from Dagobert Michelsen.
2013-04-24 10:57:03 +01:00
Thomas Adam
70bc8ef845 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2013-04-23 08:26:51 +01:00
Thomas Adam
cd60e57b6a Merge branch 'obsd-master'
Sync from OpenBSD.
2013-04-23 08:26:04 +01:00
Nicholas Marriott
3d2b7d5bce When using choose-tree -u, start with the current window
highlighted. From Thomas Adam.
2013-04-22 22:17:29 +00:00
Nicholas Marriott
04f54ab38f Get session of -t window rather than client's window. 2013-04-22 16:34:53 +00:00
Nicholas Marriott
46c7dbef0f Call recalculate_sizes() after killing window in case it is in a grouped
session, from Daniel Ralston.
2013-04-22 13:35:18 +00:00
Nicholas Marriott
11b90bc959 Pass tmux.1.in to awk on stdin rather than as an argument. 2013-04-22 14:04:40 +01:00
Nicholas Marriott
792e2856c9 Add compat for cfmakeraw, from Dagobert Michelsen. 2013-04-22 09:44:15 +01:00
Nicholas Marriott
d89b35e682 Use lockf which is more portable than flock, from Dagobert Michelsen. 2013-04-22 08:42:19 +00:00
Nicholas Marriott
a46ccbd883 -paths.h. Fixes Solaris, from Dagobert Michelsen. 2013-04-22 09:39:21 +01:00
Nicholas Marriott
5dda1abc32 Don't let server_client_check_focus use a dead bufferevent, from Romain
Francoise.
2013-04-21 21:32:00 +00:00
Theo Deraadt
55640a31b3 (long long) and %lld for time_t output
ok nicm
2013-04-17 14:52:31 +00:00
Nicholas Marriott
88428cff3a %zu format for size_t. 2013-04-17 08:41:41 +00:00
Nicholas Marriott
c24b58e2ee Generate tmux.1 using mdoc2man.awk on Solaris, issue brought up and changes
tested by Dagobert Michelsen.
2013-04-16 11:33:53 +01:00
Nicholas Marriott
9e537c808b Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2013-04-16 10:39:48 +01:00
Thomas Adam
2c4543b9e9 Add back missing -V flag
This went walkies from a previous git commit.
2013-04-14 18:07:08 +01:00
Thomas Adam
b58bca9a72 Merge branch 'obsd-master'
Conflicts:
	tmux.c
2013-04-13 17:05:49 +01:00
Nicholas Marriott
27dcf470dc Remove some Korean characters from the zero-width list that apparently
shouldn't be there, from Jeong Mok Cho.
2013-04-12 12:50:36 +00:00
Nicholas Marriott
caa8290510 Copy the client into the new cmdq in source-file so commands that work
on it (such as new-session) can work. Fixes issue reported by oss-adv at
users dot sf dot net.
2013-04-12 12:44:31 +00:00
Nicholas Marriott
7f9b225cc2 Call setlocale(LC_TIME) at startup. 2013-04-11 21:52:18 +00:00
Nicholas Marriott
4ccb2e2c21 TODO tweaks. 2013-04-11 22:45:05 +01:00
Nicholas Marriott
cbee283c26 Send an SGR0 after turning on modifyOtherKeys to fix Terminal.app which
treats \033[>4;1m and \033[4;1m (bold+underline). Reported & tested by
otto@.
2013-04-11 07:27:27 +00:00
Nicholas Marriott
9fcda95a6f Set EV_WRITE for jobs or run/if-shell jobs can hang. From Chris Johnsen. 2013-04-10 12:20:35 +00:00
Nicholas Marriott
7ada64d5f8 Fix bug where end guard in control mode was not printed after session
destroyed, from George Nachman.
2013-04-10 12:15:36 +00:00
Nicholas Marriott
20f0d917be Missed -o from set-window-option, from Ben Boeckel. 2013-04-10 12:07:18 +00:00
Nicholas Marriott
e312db1408 Add wait-for to tmux.vim from Ben Boeckel. 2013-04-10 13:04:19 +01:00
Nicholas Marriott
743bd1275f Need errno.h, reported by Swaroop M S. 2013-04-10 12:52:40 +01:00
Nicholas Marriott
69c86379e3 Remove some code not needed on OpenBSD. 2013-04-10 11:51:16 +00:00
Nicholas Marriott
46b3c1a025 Use proc_bsdinfo which works on older OS X versions, from OZAKI Kiichi. 2013-04-10 12:46:29 +01:00
Nicholas Marriott
3ea893464f TODO changes. 2013-04-10 12:43:08 +01:00
Nicholas Marriott
738e789dbd If -s to swap-pane is not given, use the current pane. 2013-03-28 15:08:12 +00:00
Nicholas Marriott
66afcf5be0 Make copy-mode -u still scroll up if already in copy mode, handy for
people who bind it with -n.
2013-03-28 15:07:42 +00:00
Nicholas Marriott
4b0ed56e32 Tidy up and trim down TODO file. 2013-03-28 12:42:00 +00:00
Nicholas Marriott
dc2af8347b New code doesn't build on old versions of OS X so only support 10.7 and
later. Reported by Jared Scheel and tested by Chris Johnsen.
2013-03-28 08:36:34 +00:00
Nicholas Marriott
64ea8829af Add define for timersub to compat.h. 2013-03-28 00:00:13 +00:00
Nicholas Marriott
629cfec8a3 Trivial typo fixes in changes. 2013-03-27 23:37:05 +00:00
Nicholas Marriott
7f63658709 Add TMUX_TMPDIR variable to put the socket directory outside
TMPDIR. From Ben Boeckel.
2013-03-27 11:24:18 +00:00
Nicholas Marriott
5e4d9a3197 Move the cursor back into the last column on CUU/CUD to match xterm
behaviour. From George Nachman.
2013-03-27 11:19:19 +00:00
Nicholas Marriott
982354765b Remove tmux's (already minimal) 88 colour support. Such terminals are
few and unnecessary.
2013-03-27 11:17:12 +00:00
Thomas Adam
5fe0576dcb Working on 1.9 2013-03-26 20:33:10 +00:00
Thomas Adam
1b083aa0fd Update CHANGES and configure.ac for 1.8 release. 2013-03-26 20:19:04 +00:00
Thomas
399a15b9fc Merge branch 'obsd-master' 2013-03-26 16:59:37 +00:00
Nicholas Marriott
dfac36b6c3 Only accept partial keys if the timer has not expired, fixes infinite
loop when Escape is pressed the wrong number of times.
2013-03-26 14:14:08 +00:00
Nicholas Marriott
771d7db3a6 Fix compiler warnings, missing #include. From Thomas Adam. 2013-03-26 10:54:48 +00:00
Thomas
00af2df102 Merge branch 'obsd-master' 2013-03-25 16:30:37 +00:00
Nicholas Marriott
be390c1991 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2013-03-25 16:13:22 +00:00