890d8da2e3
Merge branch 'obsd-master'
...
Conflicts:
log.c
proc.c
tmux.c
2015-11-25 16:37:30 +00:00
ac8678aefe
Don't print error if none to print.
2015-11-25 07:58:55 +00:00
62d3af17f9
Make environ_set va_args and use it to tidy up some calls. Also add a
...
missing word in manpage (from jmc).
2015-11-24 23:46:15 +00:00
3ff46b2e43
Shell command from -c doesn't have to be global, pass it as an argument.
2015-11-24 23:22:51 +00:00
dca93c56e0
Do lock failures slightly better, return a special value so we don't
...
unlink the wrong thing.
2015-11-24 23:01:51 +00:00
73e30cbda8
Actually show something (even if it not that helpful) if the server
...
fails to start (for example if it can't create the socket), rather than
hanging or showing nothing.
2015-11-24 22:45:44 +00:00
c18fbefe93
Document socket_path format.
2015-11-24 22:27:59 +00:00
c913fb99b6
Tidy the code that works out the socket path, and just use the full path
...
in the global socket_path rather than copying it.
2015-11-24 22:27:22 +00:00
8976dac9e0
Remove malloc_options DEBUG bit.
2015-11-24 22:09:53 +00:00
bef217b241
Switch a fprintf to a fatal, and wrap some long lines.
2015-11-24 22:04:36 +00:00
1e2df2d464
Remove the -I part of show-messages which isn't really that useful; the
...
server start time can now be accessed with a new start_time format (use:
tmux display -p '#{t:start_time}')
2015-11-24 21:52:06 +00:00
9fd3318dd8
All kill-session -C to clear alerts in all windows, suggested by Aaron
...
U'Ren.
2015-11-24 21:50:06 +00:00
4e3015a892
Log some system and libevent information at startup.
2015-11-24 21:32:36 +00:00
bdbbd9711c
Show libevent version in showmsgs -I.
2015-11-24 21:23:44 +00:00
9cccb8c115
Make the log stuff a bit tidier with some helper functions.
2015-11-24 21:19:46 +00:00
4ec61bef46
Fix usage of detach-client.
2015-11-24 20:40:51 +00:00
0a2ef2b932
Merge branch 'master' of github.com:tmux/tmux
2015-11-24 18:50:24 +00:00
7b085136a7
-sys/queue.h in proc.c, and nuke the unnecessary C++ header guards stuff and
...
sys/cdefs.h in vis.h (it causes problems on some platforms). Reported by
someone on GitHub, issue 212.
2015-11-24 18:48:07 +00:00
534f9e3ab1
Merge branch 'obsd-master'
2015-11-24 10:01:13 +00:00
b32ce34cf2
Don't allow options in table without scope set.
2015-11-24 09:34:55 +00:00
3f47ff6ecd
Merge branch 'obsd-master'
2015-11-24 00:01:16 +00:00
2adf3f42ee
Partly revert previous, it is harmless to keep support for UTF-8 mouse
...
mode inside tmux, just no longer support it for tmux itself.
2015-11-23 23:47:57 +00:00
b642b3c8e3
Merge branch 'obsd-master'
2015-11-23 21:21:12 +00:00
d63de1e407
Merge branch 'obsd-master'
...
Conflicts:
server.c
tmux.c
2015-11-23 21:20:54 +00:00
32e510bd70
Remove support for the UTF-8 mouse extension. This was a briefly used,
...
poor idea that was fairly quickly replaced by SGR mouse input (which is
now widespread). It is impossible to tell the difference between UTF-8
and non-UTF-8 mouse input; since the mouse-utf8 option was removed tmux
has not handled it correctly in any case; and it is ridiculous to have
three different forms of mouse input.
2015-11-23 20:53:09 +00:00
28e72ae34d
Don't leak extddata, memset after freeing it, not before. From Patrick
...
Palka.
2015-11-22 19:42:57 +00:00
01a2ddf3f8
Add getpw to pledge, makes tmux work in YP environments, discovered by
...
matthieu, ok deraadt
2015-11-22 19:41:19 +00:00
4fcc02ee9d
If display-time is set to 0, show status messages until a key is pressed;
...
OK nicm@
2015-11-22 18:28:01 +00:00
78a00c845c
Merge branch 'obsd-master'
...
Conflicts:
tmux.h
2015-11-21 14:24:33 +00:00
2c482939fd
Move tmux.h below system includes.
2015-11-21 08:03:18 +00:00
933929cd62
Memory leaks and an uninitialized part of utf8_data, from Patrick Palka.
2015-11-20 22:02:54 +00:00
40fefe2cbc
The alerts callback should be fired for bells even if bell-action is
...
none because it also affects the status line bell indicator (and
bell-action does not). Fixes a problem reported by tim@.
2015-11-20 16:33:46 +00:00
fce56c56ef
Instead of separate tables for different types of options, give each
...
option a scope type (server, session, window) in one table.
2015-11-20 12:01:19 +00:00
374e273df5
Only assume pasting with at least two characters, reduces problems for
...
people who can type ^B c very fast, or who are using tmux inside
something else that buffers.
2015-11-19 22:46:46 +00:00
cf688db4b5
Merge branch 'obsd-master'
2015-11-19 16:01:12 +00:00
98967c5ec9
The activity flag could already be set, so queue the callback always (if
...
not already queued) rather than only if the flag is being added. Fixes a
problem reported by tim@
2015-11-19 14:55:25 +00:00
45b4e337cb
Merge branch 'obsd-master'
2015-11-18 18:01:13 +00:00
82760a9960
Use format_expand_time for display-message.
2015-11-18 16:49:13 +00:00
c15487318b
unused -> __unused.
2015-11-18 16:45:44 +00:00
a58eaec540
Merge branch 'master' of github.com:tmux/tmux
2015-11-18 16:42:25 +00:00
7fe8edc396
Merge branch 'obsd-master'
2015-11-18 16:01:23 +00:00
8b4b3ff4fc
Add __unused, will be needed shortly.
2015-11-18 14:37:08 +00:00
577c0e3e5a
Use __unused rather than rolling our own.
2015-11-18 14:27:44 +00:00
5a5b950e8b
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
f8a1f8843c
Add -Wno-attributes.
2015-11-18 14:10:48 +00:00
9bba26f8c5
Add reallocarray prototype.
2015-11-18 14:09:17 +00:00
8fa822b521
Merge branch 'obsd-master'
2015-11-18 14:01:12 +00:00
64571368dc
Sync the entire xmalloc.[ch] with the other users, but with the addition
...
of xrealloc, xvasprintf, xvsnprintf.
2015-11-18 13:06:54 +00:00
93742ed5df
Merge branch 'master' of github.com:tmux/tmux
2015-11-18 12:55:22 +00:00
a77960c540
Add reallocarray to compat.
2015-11-18 12:54:29 +00:00
