Commit Graph

5324 Commits

Author SHA1 Message Date
beffdf6575 Merge branch 'obsd-master' 2015-05-27 16:01:22 +01:00
379400cfa6 Move the jobs output cache into the formats code so that #() work more
generally (for example, again working in set-titles-string).
2015-05-27 13:28:04 +00:00
f538f2ae9b Merge branch 'obsd-master' 2015-05-20 10:01:19 +01:00
7140cce7f3 Return empty string if format is empty rather than attempting to
allocate zero bytes.
2015-05-20 06:39:02 +00:00
1ec93570bf Merge branch 'obsd-master' 2015-05-19 12:01:20 +01:00
2c53b23d59 In terminfo, sometimes cvvis implies cnorm and sometimes it doesn't, so
don't assume it does. Fixes missing cursor with emacs-in-tmux-in-tmux.
2015-05-19 08:48:37 +00:00
4123d69b51 README.md: github-specific readme
This is the same as the current README, but allows for markdown to be used.
We could switch this over to using the README file at some point.
2015-05-17 14:52:58 +01:00
35d21be19a TRAVIS-CI: correct path to configure
Specify path to ./configure
2015-05-17 14:39:04 +01:00
beb0c01c27 Hook repo to Travis-CI
From now on, all pushes to master will result in tmux compiling against a
linux-based distribution (Debian).  This will make it easier for automatic
merges between OpenBSD and portable to be tested, without the need for so
much manual syncing.

Any build failures will be reported to me, and fixed accordingly.
2015-05-17 14:36:34 +01:00
00471dc783 Merge branch 'obsd-master' 2015-05-13 09:44:11 +01:00
3f4ee98162 To replace c0-*, add a high watermark to the pty event, and also backoff
when the any of the ttys the pane is going to write to has buffered
enough data.
2015-05-12 22:40:38 +00:00
37ae8a9e0f Tidy blank lines when outputting server info. 2015-05-12 19:36:08 +00:00
ec34439f9c Add a session_alerts format which is a list of all the alerts in the
current session in symbolic form (something like "0!,4~,5!"). Use this
in the default set-titles-string. Prompted by a request from Jan ONDREJ.
2015-05-12 15:29:29 +00:00
e958db09a7 Add bell-action "other" to pass through bells in all windows except the
current, suggested by Jan ONDREJ.
2015-05-12 15:27:46 +00:00
b833fabeb2 Left the c0-* options behind in the table. 2015-05-11 10:58:22 +00:00
44364d7112 Remove the c0-* options which never really worked satisfactorily. Going
to try something else...
2015-05-11 10:10:16 +00:00
4165ed96f8 Add back __CYGWIN__ block
This went missing during the merge from OpenBSD.
2015-05-09 20:03:24 +01:00
c11f628342 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2015-05-09 12:53:53 +01:00
504b97b6a4 Merge branch 'obsd-master'
Conflicts:
	tmux.h
2015-05-09 12:52:38 +01:00
92faa2eaeb Put the tty structs together, and tabify. 2015-05-08 16:48:12 +00:00
592cb73a69 grid_marker_cell is no longer used. 2015-05-08 16:44:03 +00:00
74b2c40b1b mode_key_entry can go into mode-key.c; also a few spaces->tabs. 2015-05-08 16:33:29 +00:00
a538141a72 window_choose_mode_item can move into window-choose.c. 2015-05-08 16:23:34 +00:00
c4a4bd6ac5 Move input parser structs into input.c (removing fairly useless
saved_cursor_[xy] formats as a side-effect).
2015-05-08 16:18:04 +00:00
879de25583 Remove some stuff that accidentally ended up here from portable, and
remove a little-used debug function.
2015-05-08 15:56:49 +00:00
d174b9cfcc Update environment when switching sessions as well as attaching, from Si
Beaumont.
2015-05-07 14:07:16 +00:00
8e9b6e0948 Style spacing nits. 2015-05-07 11:42:56 +00:00
63b7a031a5 queue.h should come from compat.h. 2015-05-07 11:43:52 +01:00
1282bb81fe array.h can be local to window-choose.c now. 2015-05-07 08:08:54 +00:00
7becf326e3 Use a TAILQ not array for find-window. 2015-05-07 07:59:52 +00:00
73c871ba0a Simplify environ_push so it doesn't need the ARRAY_* functions. 2015-05-07 07:35:31 +00:00
b6be03f01a If status line is at the top, the offset needs to be adjusted when
drawing pane numbers.  Based on a diff from John O'Meara.
2015-05-07 07:16:14 +00:00
0b39e6427f Remove ARRAY_* from history and expand completion to complete a) layout
names and b) targets beginning with -t or -s.
2015-05-06 23:56:46 +00:00
6525ca5158 Start working on 2.1 2015-05-07 00:00:44 +01:00
e362d42dc6 CHANGES for tmux 2.0 2015-05-07 00:00:44 +01:00
f10d3675f8 Merge branch 'obsd-master' 2015-05-06 10:03:52 +01:00
31b1ab4852 Add a format window_linked which is 1 if a window has been linked
multiple times, also remove the default space in window_flags and use a
conditional to add it in window-status-format (this means additional
flags can be added in the option without extra spaces). From Thomas Adam
with tweaks by me.
2015-05-06 08:35:39 +00:00
33a585c47f Turn cursor off during redraw, pointed out by George Nachman. 2015-05-06 07:52:06 +00:00
672df72b71 Use the right index when expanding/collapsing tree, from Thomas Adam. 2015-05-04 13:04:10 +00:00
c0cf4843e5 Merge branch 'obsd-master' 2015-04-29 18:42:12 +01:00
69b8f100b7 Do not complain when directions fail. 2015-04-29 16:26:17 +00:00
7382ba82c5 If default-terminal is set to "screen" or "screen-*", emulate screen's
historical (incorrect) behaviour for SGR 3 and send smso
(standout). Previously, we would send sitm (italics) if the terminal
outside had it and smso otherwise. This was acceptably until recently
because xterm's terminfo entry lacked sitm, so most users got smso.

People who want italics should set default-terminal to the forthcoming
"tmux" entry (and be prepared to deal with it being missing on older
hosts).

As a side-effect this changes default-terminal to be a server rather
than a session option.

suggested by and ok naddy
2015-04-29 15:59:08 +00:00
8794562a85 Add tmux4.png. 2015-04-28 16:04:07 +01:00
31ab5caa35 Renumber screenshots. 2015-04-28 15:34:09 +01:00
1ed5326f5a Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2015-04-28 15:18:53 +01:00
ab5f9ab55b Update two of the screenshots. 2015-04-28 15:12:45 +01:00
dc2adc6bc1 Merge branch 'obsd-master' 2015-04-28 14:57:15 +01:00
7981e653d8 But this does work. 2015-04-28 14:01:03 +01:00
bc9198072b Upload all the files. 2015-04-28 13:58:17 +01:00
e88c48ce0e This doesn't work. 2015-04-28 13:58:00 +01:00