ce0b285aad
Fix up missing bits.
2012-09-25 08:54:01 +01:00
17bbf90393
Add notification for input from a pane, from George Nachman.
2012-09-25 07:41:22 +00:00
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
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
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
e342304134
Merge branch 'obsd-master'
...
Conflicts:
cmd.c
format.c
osdep-openbsd.c
tmux.h
2012-09-24 17:55:06 +01:00
d785c37ee2
Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.
2012-09-24 17:53:15 +01:00
69683ba7b4
Use ACS characters for choose-tree arrows based on diff from Romain
...
Francoise.
2012-09-24 17:53:10 +01:00
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
84612a8196
Add control_write_buffer, from George Nachman.
2012-09-24 13:39:10 +00:00
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
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
5b85efeb93
Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.
2012-09-24 13:56:32 +01:00
eb0ad181e9
Use ACS characters for choose-tree arrows based on diff from Romain
...
Francoise.
2012-09-24 12:53:55 +00:00
dc3df931d7
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
...
Conflicts:
SYNCING
2012-09-20 23:02:49 +01:00
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
73f29094d0
.+ SYNCING.
2012-09-19 09:50:39 +01:00
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
68cc635ed5
Merge branch 'obsd-master'
...
Sync from OpenBSD.
2012-09-15 12:23:25 +01:00
b2a9f4115f
Handle empty list properly in choose-list, based on fix from Thomas Adam.
2012-09-05 10:14:21 +00:00
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
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
b79f86e32a
Trivial code simplification from Tim Ruehsen.
2012-09-04 22:37:31 +01:00
40505e59f1
Remove xterm CRA support - support is patchy and it will be done better
...
using margins.
2012-09-04 22:37:31 +01:00
a1cd0eee1b
Use the right index when adding item in choose-tree, from Thomas Adam.
2012-09-04 22:37:31 +01:00
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
4d7967de7a
Rename variables to something a but more understandable.
2012-09-04 22:37:31 +01:00
28fd3a3835
add cmd-choose-list to allow arbitrary options to be selected. From
...
Thomas Adam.
2012-09-04 22:37:29 +01:00
996a636713
Remove an unused variable.
2012-09-04 22:36:56 +01:00
41a448193f
Send notifications to control clients. Also don't redraw client when
...
suspended.
2012-09-04 22:36:47 +01:00
0304555184
Change format of choose-tree arrows slightly, from Romain Francoise.
2012-09-04 22:35:52 +01:00
f536dc47c4
If stdin in the client is enable immediately, tmux will eat anything
...
sent to stdin before it is needed, which can be inconvenient (eg pasting
commands). Instead, start with stdin disabled and reuse MSG_STDIN from
server->client to mean that stdin should be enabled. Based on a diff
from Chris Johnsen.
2012-09-04 22:35:52 +01:00
d6066552ee
Can't call evtimer_pending on uninitialized events, call
...
evtimer_initialized first. Reported by Vladimir Lomov, fix from Thomas
Adam slightly modified by me.
2012-09-04 22:35:52 +01:00
59c760dfcd
Trivial code simplification from Tim Ruehsen.
2012-09-04 13:24:50 +00:00
c06b2e4fb9
.gitignore + Makefile Makefile.in configure
2012-09-04 09:26:54 +01:00
1f29f6ac4d
Add .gitignore
...
Tell git not to consider certain files, such as object files.
2012-09-04 09:21:09 +01:00
3ad812cbd5
Make autogen.sh executable
2012-09-04 08:19:12 +01:00
53c430eced
Change WWW links to Git not Subverson.
2012-09-04 08:00:34 +01:00
6307d63715
Remove xterm CRA support - support is patchy and it will be done better
...
using margins.
2012-09-03 15:47:40 +00:00
4f8a6867fa
Use the right index when adding item in choose-tree, from Thomas Adam.
2012-09-03 12:24:25 +00:00
9e7bbc7281
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-03 12:20:17 +00:00
c96a2a3c9e
Rename variables to something a but more understandable.
2012-09-03 10:02:39 +00:00
7263fa36eb
add cmd-choose-list to allow arbitrary options to be selected. From
...
Thomas Adam.
2012-09-03 09:57:57 +00:00
adc9fad4ac
Remove an unused variable.
2012-09-03 09:36:07 +00:00
9247c90d69
Send notifications to control clients. Also don't redraw client when
...
suspended.
2012-09-03 09:32:38 +00:00
a679a4a708
Change format of choose-tree arrows slightly, from Romain Francoise.
2012-09-03 09:01:16 +00:00
2e43372d0b
If stdin in the client is enable immediately, tmux will eat anything
...
sent to stdin before it is needed, which can be inconvenient (eg pasting
commands). Instead, start with stdin disabled and reuse MSG_STDIN from
server->client to mean that stdin should be enabled. Based on a diff
from Chris Johnsen.
2012-09-03 08:48:57 +00:00
473911fb73
Can't call evtimer_pending on uninitialized events, call
...
evtimer_initialized first. Reported by Vladimir Lomov, fix from Thomas
Adam slightly modified by me.
2012-09-03 06:26:48 +00:00
686d461144
Sync OpenBSD patchset 1168:
...
Change a log to fprintf that was missed last time around, from Tiago Cunha.
2012-08-31 09:25:19 +00:00
554f19eb05
Sync OpenBSD patchset 1167:
...
Instead of requiring a prompt to enter all numbers >10, go back to
0-9a-z and add A-Z and enter the prompt when M-0 to M-9 are pressed
(like in copy mode). Prompted by request from mcbride@, help from Thomas
Adam.
2012-08-31 09:24:51 +00:00
