Nicholas Marriott
f4196138ce
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2015-02-18 22:36:53 +00:00
Nicholas Marriott
fe1aa9299e
Merge branch 'tmp'
2015-02-18 22:36:31 +00:00
nicm
568f5ef3c6
When given an invalid style, don't set the option to the default. Fix
...
from J Raynor. Also make style_parse not alter the grid_cell when it
fails.
2015-02-18 15:32:37 +00:00
Nicholas Marriott
bafe6f5a7c
Remove LocalWords.
2015-02-16 17:19:37 +00:00
Thomas Adam
be6dc83277
Revert "Add -Wno-format-nonliteral to Makefile.am"
...
Oh well. This will hide legitimate programming errors, which I knew, so I'll
just have to accept that when looking through the compiler output.
This reverts commit c2bbaab2ac
2015-02-15 21:19:51 +00:00
Thomas Adam
c2bbaab2ac
Add -Wno-format-nonliteral to Makefile.am
...
Shut GCC up about non-literal arguments to functions which make use of
placeholder expansions (printf, strftime, etc.)
2015-02-15 20:07:48 +00:00
Thomas Adam
ffb83d23e1
Merge branch 'obsd-master'
...
Conflicts:
Makefile
2015-02-14 23:54:07 +00:00
nicm
4d05d88304
Take a reference to prevent cmdq being freed during the command. Can
...
happen to cfg_cmd_q (possibly others) when source-file recurses into
cmdq_continue. Fixes bug reported by Ismail Donmez and Theo Buehler.
2015-02-12 09:56:19 +00:00
nicm
9ae2284726
Merge clock-mode command into copy-mode.
2015-02-09 23:18:19 +00:00
Nicholas Marriott
b4750e4c35
Add a note about cmd_find_*.
2015-02-09 13:12:25 +00:00
nicm
1b2c62afe9
Entries in the window list can be NULL, prompted by a crash seen by Ben
...
Boeckel.
2015-02-09 12:47:18 +00:00
nicm
f28032b031
Check for \0 in the right place, from J Raynor.
2015-02-07 23:43:41 +00:00
nicm
52756fb3c5
Use the same time for both calls to format_expand_time.
2015-02-06 23:28:52 +00:00
Nicholas Marriott
cb018a4212
No paths.h on Solaris.
2015-02-06 23:24:44 +00:00
Thomas Adam
833fe5bdee
Merge branch 'obsd-master'
...
Conflicts:
cmd-pipe-pane.c
2015-02-06 19:07:43 +00:00
nicm
313f2263f8
status_replace can now become local to status.c and it no longer needs
...
the jobsflag argument. While here there is no need to repeat work that
format_defaults already does.
2015-02-06 17:21:08 +00:00
nicm
8d94bb67ab
Use formats not status_replace for set-titles-string.
2015-02-06 17:17:12 +00:00
nicm
03758a50dc
Add format_expand_time and use it instead of status_replace where
...
command execution is not needed.
2015-02-06 17:11:39 +00:00
nicm
83a8e1fd20
Move pane border options to window options rather than session, from Marc Finet.
2015-02-06 15:09:34 +00:00
nicm
90bf7026f6
Reset bracket paste mode on detach.
2015-02-05 11:46:57 +00:00
nicm
f1e68bfdd2
Remove a couple of now-unused variables.
2015-02-05 10:32:39 +00:00
nicm
4946f74253
Wrap all the individual format_* calls in a single format_defaults
...
functions.
2015-02-05 10:29:43 +00:00
nicm
e5d9ceff18
There is no need to save the guard state because the function checks it
...
again anyway.
2015-02-05 10:26:29 +00:00
nicm
c9642ee213
Remove two unused arguments from status_replace.
2015-02-01 23:43:23 +00:00
nicm
4e03239d1f
Tidy up detach-client a bit.
2015-01-30 15:57:30 +00:00
nicm
144025e3e6
Focus off needs to be sent with tty_raw, reported by Geoff Nixon.
2015-01-30 12:33:03 +00:00
Nicholas Marriott
93c3fb78a3
has-session is now part of new-session.
2015-01-29 12:56:30 +00:00
Nicholas Marriott
51233d8b2a
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2015-01-25 20:31:22 +00:00
nicm
adcc71d4d5
Don't leak the individual strings when copying environment.
2015-01-25 16:53:46 +00:00
Nicholas Marriott
68429cd0d3
Spaces to tabs.
2015-01-25 16:51:49 +00:00
sthen
c38f0d85da
In options-table.c r1.51 an extra space was added to the default status-right,
...
overrunning status-right-length with long window titles. Allow for the extra
space so the last digit of the year isn't lost. ok nicm@
2015-01-21 12:20:56 +00:00
sthen
f9c7f9a17a
typo in comment ;) ok nicm
2015-01-20 10:57:10 +00:00
nicm
16bdd970dc
Support blinking cursor mode, both the xterm CSI ?12 h/l and (the
...
backwards) screen CSI 34 h/l. From Guanpeng Xu.
2015-01-20 08:18:04 +00:00
nicm
d451502676
Make a tmux-%u directory under TMUX_TMPDIR, like TMPDIR.
2015-01-19 09:58:34 +00:00
Thomas Adam
df6488a470
Merge branch 'obsd-master'
2015-01-16 19:17:31 +00:00
deraadt
776eef49d8
Replace <sys/param.h> with <limits.h> and other less dirty headers where
...
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
2015-01-16 06:40:13 +00:00
nicm
6e764fb53e
Remove an unnecessary variable and shorten a line.
2015-01-15 13:43:13 +00:00
nicm
86207ee676
Shorten some long lines.
2015-01-15 13:35:13 +00:00
Nicholas Marriott
66e8811c64
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2015-01-12 22:46:44 +00:00
Nicholas Marriott
a9644c1f8b
We do not need to add /usr/local to CPPFLAGS; if configure managed to pass then
...
the dependencies must already be in the search path. Reported by Romain Naour.
2015-01-12 22:46:06 +00:00
deraadt
8a8e2eb04a
correctly use HOST_NAME_MAX.
...
Some notes:
POSIX HOST_NAME_MAX doesn't include the NUL.
POSIX LOGIN_NAME_MAX and TTY_NAME_MAX do include the NUL.
BSD MAXHOSTNAMELEN includes the NUL. Actually, most of the historical
BSD MAX* defines did include the NUL, except for the historical
mistake of utmp fields without NULs in the string, which directly led
to strncpy.. just showing how error prone this kind of accounting is.
CSRG did right. Somehow POSIX missed the memo on the concepts of
carefulness and consistancy, and we are still paying the price when
people trip over this. Of course, glibc is even more amazing (that is
a hint to blackhats)
ok guenther
2015-01-11 04:14:40 +00:00
Thomas Adam
da72a0b7a8
Merge branch 'obsd-master'
2015-01-10 21:38:50 +00:00
nicm
aae2b7aa89
Revert to r1.16 since this is still clearly broken and I can't see how
...
right now.
2015-01-06 21:14:42 +00:00
nicm
fee096a406
Unzoom before kill, from Thomas Adam.
2015-01-06 09:12:53 +00:00
nicm
be0ad01b7c
Add missing default bindings, from Theo Buehler.
2015-01-06 09:12:02 +00:00
Nicholas Marriott
daea0e4fff
Need param.h, from Ismail Donmez.
2014-12-31 10:00:47 +00:00
Nicholas Marriott
cc1bc9717c
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2014-12-21 15:47:21 +00:00
Nicholas Marriott
9cb5afe114
t_kP is the same as PageUp, so no need for it, from Daniel Hahler.
2014-12-21 15:46:43 +00:00
Thomas Adam
2a9a75a569
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2014-12-19 19:23:08 +00:00
Thomas Adam
5f8138faf5
Merge branch 'obsd-master'
...
Conflicts:
format.c
2014-12-19 19:22:19 +00:00
