circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-15 17:08:54 +00:00
Code Issues Projects Releases Wiki Activity
5,857 Commits 3 Branches 37 Tags 31 MiB
060515684d
Commit Graph

5857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Adam
31f93d8445 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-25 23:32:14 +01:00
Nicholas Marriott
2a609b332f Add ability to active pane in list-windows and find-window formats, from 
Carl Henrik Lunde.
 2012-10-25 11:26:47 +00:00
Nicholas Marriott
18236c1c1b Fix BELL_NONE which had been broken in some code reorganisation or other 
also don't redraw unnecessarily. From Seiji Ohashi.
 2012-10-25 11:16:53 +00:00
Nicholas Marriott
596e9d8068 Fix bad size in memcpy from Romain Francoise. 2012-10-25 11:14:46 +00:00
Nicholas Marriott
589b4b8c6a Fix typo bell->bells from Thomas Adam. 2012-10-25 11:11:58 +00:00
Nicholas Marriott
60808bbded +. 2012-10-23 18:47:52 +01:00
Thomas Adam
d4dc52ec84 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-16 18:30:36 +01:00
Nicholas Marriott
c695c0c085 Fix some function prototypes from Helmut Tessarek. 2012-10-15 21:53:30 +00:00
Nicholas Marriott
a91c598971 Link to git instructions from index.html. 2012-10-15 18:25:44 +01:00
Thomas Adam
bf45619441 Don't push all tags when releasing tmux 
Pushing all tags with "git push --tags" will also transfer tags from the
tmux-openbsd repository which isn't what we want to do!

Therefore, just specify the newly created tag to push instead for the next
release.
 2012-10-13 13:35:35 +01:00
Thomas Adam
9b2aabb752 Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux 2012-10-13 12:25:08 +01:00
Thomas Adam
c0fb5edff9 Update website. 2012-10-13 12:22:11 +01:00
Thomas Adam
5cdc9591d3 Working on 1.8 2012-10-13 12:12:43 +01:00
Thomas Adam
2b5c3fc49f Update NOTES, CHANGES, configure.ac for 1.7 release 2012-10-13 11:56:14 +01:00
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