c4c98df4f2
Add -Wdeclaration-after-statement.
2013-01-30 16:35:00 +00:00
a3f4eb7b24
Merge branch 'obsd-master'
...
Conflicts:
Makefile
grid-utf8.c
2013-01-30 15:27:19 +00:00
fdbfc7e349
Rather than having two grids for each pane, one for ASCII and one for
...
UTF-8, collapse the two together. Simplifies the code at the expense of
more memory (which can probably be reduced again later).
2013-01-18 02:16:21 +00:00
c2e2107063
Style nits - return (x) not return x.
2013-01-18 02:10:29 +00:00
2ca8b7f359
Merge branch 'obsd-master'
2013-01-17 22:14:18 +00:00
3a09e01a8e
Do not allow cursor colours to be set beginning with ? as that will
...
report the colour, from Hayaki Saito.
2013-01-17 20:30:43 +00:00
d31315884c
Fix some blank line nits.
2013-01-17 03:51:21 +00:00
57ca428975
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2013-01-17 02:09:18 +00:00
b0e2ef1a7d
Update www for new SF URLs.
2013-01-17 02:08:58 +00:00
b237d9dd95
Updated SYNCING
2013-01-17 02:02:04 +00:00
de194016ec
Merge branch 'obsd-master'
2013-01-17 01:38:21 +00:00
e33ba57c13
Remove the layout undo/redo code which never really worked.
2013-01-17 00:11:22 +00:00
44f8e1caff
Implement ECH (erase character, CSI X). Reported by Christian Neukirchen.
2013-01-15 23:18:55 +00:00
bc2e4a36df
If timing between keys is less than (by default) 1 millisecond, assume
...
the text is being pasted. assume-paste-time option changes the value (0
disables). Based on a diff from Marcin Kulik.
2013-01-15 22:55:29 +00:00
675c6b3773
Merge branch 'obsd-master'
...
Sync from OpenBSD.
2012-12-31 18:50:37 +00:00
f4472c16b2
Fix keyword matching.
...
Per the documentation in *:syn-keyword* (in particular *E789*), the
optional characters inside the square brackets can only be used in the
end. Therefore, unfold some keywords which were being wrongly
recognised.
Noticed by Bruce Wolk.
2012-12-24 17:18:35 +00:00
854e8ae04d
Add ^ and $ special command targets to select lowest and highest
...
numbered windows, from Raghavendra D Prabhu.
2012-12-24 12:38:57 +00:00
3e6d45acf6
Add -T option to select-window to toggle to last window if already
...
current, from Raghavendra D Prabhu.
2012-12-24 12:34:32 +00:00
a2c8af97e9
Add missing function prototype.
2012-12-24 12:33:05 +00:00
b18ff67646
Add a -u flag to choose-tree to start uncollapsed, from Raghavendra D
...
Prabhu.
2012-12-24 12:25:52 +00:00
6a5adfc0ba
We no longer use struct eproc for kinfo_proc in sysctl.h so there
...
is no direct need for sys/proc.h or sys/resource.h. Some consumers
of kinfo_proc need these for the proc flags and rlimit defines like
RLIM_INF so add the appropriate includes to them.
OK deraadt@ sthen@
2012-12-18 21:28:45 +00:00
9714880283
Change load_cfg to fix a crash reported by jasper.
2012-12-13 15:36:16 +00:00
3a0016a78a
Use the CMD_*_USAGE defines consistently, from Thomas Adam.
2012-12-09 23:17:35 +00:00
fb83914bd7
Merge branch 'obsd-master'
...
Sync from OpenBSD.
2012-12-08 20:29:37 +00:00
d5de489dc4
.+
2012-12-08 19:16:45 +00:00
3fa4f691e3
Handle resetting 256-colours properly when parsing #[default],
...
#[fg=default] and #[bg=default] styles.
2012-12-08 17:05:57 +00:00
8600fe054b
Use strlcat not strncat in load_cfg and some other trivial tidying from
...
Tiago Cunha.
2012-12-06 13:06:05 +00:00
8378be03d1
Fix argument order in a log statement.
2012-12-06 12:49:13 +00:00
51a1dbfe09
Simplify command string parsing with a helper function from Tiago Cunha.
2012-12-06 12:47:48 +00:00
8264e92b37
Fix return value of load_cfg, from Thomas Adam.
2012-11-27 22:59:34 +00:00
739a76634c
Merge branch 'obsd-master'
...
Sync from OpenBSD.
2012-11-27 22:24:00 +00:00
47c097cb51
Support middle-click paste, based on a diff from Ailin Nemui.
2012-11-27 20:22:12 +00:00
24d7d073ff
Support the 47 and 1047 SM and RM sequences (alternate screen without
...
cursor), requested by I forget who ages ago.
2012-11-27 20:08:42 +00:00
39631edb98
Merge branch 'obsd-master'
...
Sync from OpenBSD.
2012-11-27 18:12:04 +00:00
9b8998aeec
Correctly aggregate together errors from nested config files (with
...
source-file). Fix by Thomas Adam, reported by Sam Livingstone-Gray
2012-11-27 16:12:29 +00:00
4aa4e9fb26
Allow cmd-run-shell to accept -t to specify the pane to display the
...
output, requested by Alexander Tsepkov.
2012-11-27 15:09:35 +00:00
1fcc7f50ac
When scrolling in copy mode with the mouse, scroll screen rather than
...
moving cursor. This change from Ailin Nemui, alternative to a change
from Stephen Hicks.
2012-11-27 14:42:56 +00:00
6ef4f8e16c
Revert last, after discussion it isn't necessary.
2012-11-27 14:26:48 +00:00
93224260ae
Add window-status-last-* options, from Boris Faure.
2012-11-27 13:52:23 +00:00
991bfcf443
Fix session choice so that preferring unattached sessions actually
...
works, reported by Drew Frank.
2012-11-27 09:20:03 +00:00
d762ced298
Call realpath earlier on the socket directory path rather than on the
...
socket file path because the latter may not exist yet and in that case
realpath is allowed to fail. From Romain Francoise.
2012-11-26 11:35:28 +00:00
1bc910a963
Merge branch 'obsd-master'
...
Sync from OpenBSD.
2012-11-22 22:19:04 +00:00
63f451965c
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
2012-11-22 16:48:50 +00:00
260419f48e
Put helper function back, will be needed in a bit.
2012-11-22 14:41:11 +00:00
c04aa90207
Merge branch 'obsd-master'
...
Sync from OpenBSD.
* obsd-master:
Add halfpage commands to mode command string table (missed by accident), from Thomas Adam.
Clarify some points about config files, notably that they are only read at server start. From Thomas Adam.
Use a utility function for common code to show errors in config file, from Thomas Adam.
2012-11-22 13:24:14 +00:00
0679eb6a6d
Add halfpage commands to mode command string table (missed by accident),
...
from Thomas Adam.
2012-11-19 10:51:25 +00:00
9a7e5bd1d3
Clarify some points about config files, notably that they are only read
...
at server start. From Thomas Adam.
2012-11-19 10:50:24 +00:00
827b311c81
Use a utility function for common code to show errors in config file,
...
from Thomas Adam.
2012-11-19 10:38:06 +00:00
e4679172e3
Sanitise additional .mailmap entries
...
This sanitises multiple author addresses some more, mapping them back to one
common entity.
2012-11-08 21:39:35 +00:00
be10e8eee6
Merge branch 'obsd-master'
...
Sync from OpenBSD.
2012-11-08 21:27:40 +00:00
