circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-27 03:48:46 +00:00
Code Issues Projects Releases Wiki Activity
4,443 Commits 3 Branches 37 Tags 36 MiB
64ea8829af
Commit Graph

4443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Adam
b4ad1759b8 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-11 17:52:23 +01:00
Nicholas Marriott
6589120667 Fix a use-after-free when collapsing the tree in choose mode, from 
Carl Henrik Lunde.
 2012-10-11 08:53:50 +00:00
Thomas Adam
0cdcae3532 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-09 20:47:28 +01:00
Nicholas Marriott
0e87430462 Add tree keys to vi mode too, missed by accident. 2012-10-09 18:08:21 +00:00
Thomas Adam
43d2b6a648 Remove references to PATCHES file 2012-10-07 10:57:11 +01:00
Nicholas Marriott
8249fbfb60 Make some tweaks to NOTES and add a paragraph on git rather than huge PATCHES 
file.
 2012-10-05 09:05:44 +01:00
Thomas Adam
3a545376f0 Reference PATCHES document from TODO file 
In terms of submitting patches via the TODO file from the tmux portable
repository, mention the PATCHES file in passing.
 2012-10-05 00:19:53 +01:00
Thomas Adam
5cc9380bfa Add PATCHES document 
This describes how to send patches against the portable tmux version as
hosted on souceforge, using Git.
 2012-10-05 00:18:50 +01:00
Thomas Adam
ca84659ca1 Add explanatory sections to TODO file 
This restructures the TODO file slightly, separating out the
terminal-specific tasks from the tmux user interface tasks.
 2012-10-04 23:57:31 +01:00
Thomas Adam
8dc78377d1 +. 2012-10-04 22:45:22 +01:00
Thomas Adam
64deb34c3b Add choose-list to tmux.vim 2012-10-02 18:13:13 +01:00
Thomas Adam
8b05d84ece Update TODO list. 
Keeping this in sync with work done.
 2012-10-02 13:02:30 +01:00
Thomas Adam
619ffe1f4f Merge branch 'obsd-master' 
Sync from OpenBSD.

* obsd-master:
  Allow session tree (C-b s) to expand and collapse sessions with left/right/space keys. From Thomas Adam.
  Remove some out of date text from man page, from Thomas Adam.
 2012-10-02 10:47:16 +01:00
Nicholas Marriott
9107b0c69a Allow session tree (C-b s) to expand and collapse sessions with 
left/right/space keys. From Thomas Adam.
 2012-10-02 08:16:28 +00:00
Nicholas Marriott
ea289bc457 Remove some out of date text from man page, from Thomas Adam. 2012-10-02 08:02:21 +00:00
Thomas Adam
9763282dc1 Merge branch 'obsd-master' 2012-10-01 13:32:52 +01:00
Nicholas Marriott
44dccf7ea2 Do not test client flags against TTY_FREEZE bit, reported by Tom Ryder. 2012-09-29 06:57:56 +00:00
Thomas
80b5c0e076 Merge branch 'obsd-master' 
Sync from OpenBSD.

* obsd-master:
  Do not leak file descriptor if not a tty, reported by Sebastien Marie.
 2012-09-27 11:55:55 +01:00
Nicholas Marriott
7a3ec77dbd Do not leak file descriptor if not a tty, reported by Sebastien Marie. 2012-09-27 10:02:56 +00:00
Thomas Adam
48750022c0 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-09-25 17:05:36 +01:00
Nicholas Marriott
ce0b285aad Fix up missing bits. 2012-09-25 08:54:01 +01:00
Nicholas Marriott
17bbf90393 Add notification for input from a pane, from George Nachman. 2012-09-25 07:41:22 +00:00
Nicholas Marriott
0d0b3cf9a4 Fix search forward so it can match strings on the last line, SF bug 
3571114 from "LiJunLe".
 2012-09-25 07:39:28 +00:00
Nicholas Marriott
149f5bac05 Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux 
Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c
 2012-09-25 08:07:39 +01:00
Thomas Adam
253f1395a0 Don't rely on "-s ours" for merging 
The ours strategy assumes one subsumes the other -- which isn't the case for
the portable version, so for now -- just go back to using the default merge
strategy of recursive, and fix-up any conflicts manually.
 2012-09-24 18:05:34 +01:00
Thomas Adam
e342304134 Merge branch 'obsd-master' 
Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c
	tmux.h
 2012-09-24 17:55:06 +01:00
Nicholas Marriott
d785c37ee2 Fix some UTF-8 Japanese issue on OS X, SF bug 3566884. 2012-09-24 17:53:15 +01:00
Nicholas Marriott
69683ba7b4 Use ACS characters for choose-tree arrows based on diff from Romain 
Francoise.
 2012-09-24 17:53:10 +01:00
Thomas
7b189f1ad7 Merge branch 'obsd-master' 
* obsd-master:
  Use pgrp of pty fd not pid of immediate child when recovering current working directory (like current process). From Marcel Partap.
  Use ACS characters for choose-tree arrows based on diff from Romain Francoise.
 2012-09-24 14:56:56 +01:00
Nicholas Marriott
84612a8196 Add control_write_buffer, from George Nachman. 2012-09-24 13:39:10 +00:00
Nicholas Marriott
5d60bc7f7c Use pgrp of pty fd not pid of immediate child when recovering current working 
directory (like current process). From Marcel Partap.
 2012-09-24 14:05:38 +01:00
Nicholas Marriott
42272dfbd5 Use pgrp of pty fd not pid of immediate child when recovering current 
working directory (like current process). From Marcel Partap.
 2012-09-24 13:05:10 +00:00
Nicholas Marriott
5b85efeb93 Fix some UTF-8 Japanese issue on OS X, SF bug 3566884. 2012-09-24 13:56:32 +01:00
Nicholas Marriott
eb0ad181e9 Use ACS characters for choose-tree arrows based on diff from Romain 
Francoise.
 2012-09-24 12:53:55 +00:00
Thomas Adam
dc3df931d7 Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux 
Conflicts:
	SYNCING
 2012-09-20 23:02:49 +01:00
Thomas Adam
d3d48fa3e7 Add release instructions for new tmux versions 
Document how actual releases will happen.  Largely based on tcunha's
original notes.  Tweaked by me slightly to adapt to git.
 2012-09-20 22:59:08 +01:00
Thomas Adam
73f29094d0 .+ SYNCING. 2012-09-19 09:50:39 +01:00
Thomas Adam
a043b975ca Add SYNCING document 
This explains how to keep the tmux and tmux-openbsd repositories in sync
with one another during the course of tmux development.
 2012-09-16 22:53:58 +01:00
Thomas Adam
68cc635ed5 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-09-15 12:23:25 +01:00
Nicholas Marriott
b2a9f4115f Handle empty list properly in choose-list, based on fix from Thomas Adam. 2012-09-05 10:14:21 +00:00
Nicholas Marriott
b433886840 We can't tell what the terminal has done with a DCS string, so reset the 
cursor and attributes afterwards.
 2012-09-05 09:59:41 +00:00
Thomas Adam
248cd423a1 Fixup Makefile.am 
Since this is just Makefile in the OpenBSD directory, pull in those trivial
changes to the templated one for use in autotools.
 2012-09-04 22:50:16 +01:00
Nicholas Marriott
b79f86e32a Trivial code simplification from Tim Ruehsen. 2012-09-04 22:37:31 +01:00
Nicholas Marriott
40505e59f1 Remove xterm CRA support - support is patchy and it will be done better 
using margins.
 2012-09-04 22:37:31 +01:00
Nicholas Marriott
a1cd0eee1b Use the right index when adding item in choose-tree, from Thomas Adam. 2012-09-04 22:37:31 +01:00
Nicholas Marriott
c914fcfacb When choosing a pane found by find-window, switch to that pane rather 
than just the window. Also use a helper function for the inner loop.
 2012-09-04 22:37:31 +01:00
Nicholas Marriott
4d7967de7a Rename variables to something a but more understandable. 2012-09-04 22:37:31 +01:00
Nicholas Marriott
28fd3a3835 add cmd-choose-list to allow arbitrary options to be selected. From 
Thomas Adam.
 2012-09-04 22:37:29 +01:00
Nicholas Marriott
996a636713 Remove an unused variable. 2012-09-04 22:36:56 +01:00
Nicholas Marriott
41a448193f Send notifications to control clients. Also don't redraw client when 
suspended.
 2012-09-04 22:36:47 +01:00