Commit Graph

6425 Commits

Author SHA1 Message Date
21240c1a8f Merge branch 'obsd-master' 2017-04-22 00:01:11 +01:00
c8ecbf38ab Log error properly when no current state, and some other minor tweaks. 2017-04-21 22:23:24 +00:00
194a121ef6 Make sure cmd_find_from_* clear the state if they fail. 2017-04-21 22:00:06 +00:00
8867951144 Rename a variable. 2017-04-21 21:02:26 +00:00
fd13731049 Merge branch 'obsd-master' 2017-04-21 22:01:14 +01:00
c68ceca8cd Clear shared state if not filling it in. 2017-04-21 20:34:05 +00:00
efaf4c16cf Make the cmd_find_* functions more obvious when looking for a client,
rather than having it inside other functions. Should be no change to the
way targets are resolved just yet.
2017-04-21 20:26:34 +00:00
2ad09ab5af Key needs to be initialized to zero now it has flags in it. 2017-04-21 19:33:07 +00:00
1f209ed030 Merge branch 'obsd-master' 2017-04-21 20:01:18 +01:00
3c876235cc Style nits and an unused struct. 2017-04-21 18:18:17 +00:00
afa4e3ed9c Add cmd_find_from_winlink_pane and use it in a couple of places, and
make functions that can't fail void.
2017-04-21 17:22:20 +00:00
c376c5a817 Merge branch 'obsd-master' 2017-04-21 18:01:11 +01:00
92a77e7654 It is annoying that the copy mode key table (or any other key table)
will suppress root key table bindings. So change to always check the
root table if no binding is found in the current table (whether it be
the prefix table from pressing the prefix or the copy mode table from a
pane).

A root key binding can be blocked by binding the key to a command that
does nothing (like send-keys with no arguments).

Problem reported by Thomas Sattler.
2017-04-21 16:04:18 +00:00
4612419c14 Merge branch 'obsd-master' 2017-04-21 16:01:18 +01:00
c799425069 More unnecessary arguments now winlink points back to session. 2017-04-21 14:09:44 +00:00
428be9803c History needs to be loaded after config parsing is done - now that
commands are queued, that's in cfg_done not after start_cfg finishes.
2017-04-21 14:04:54 +00:00
bba588752f Store state shared between multiple commands in the queue in a shared
structure.
2017-04-21 14:01:19 +00:00
311dad8c28 Do not run the config file in the context of the first client, instead
use no client like we did before. This means commands like new-session
won't try to attach if they are in the config file.
2017-04-21 13:15:43 +00:00
93062ad099 Fix after merge 2017-04-21 09:29:22 +01:00
22e594fcea Merge branch 'obsd-master'
Conflicts:
	Makefile.am
	pty.c
2017-04-21 09:25:07 +01:00
02580ac134 Typo; Daniel Hahler. 2017-04-21 06:49:38 +01:00
b723f50e65 Do not need getopt.h for getopt, from Eric N Vander Weele. 2017-04-20 20:35:11 +01:00
4a2e75fc8c Merge branch 'master' of github.com:tmux/tmux 2017-04-20 19:09:36 +01:00
9420758127 getptmfd() and fdforkpty() compat. 2017-04-20 19:09:07 +01:00
87997efe8d Use fdforkpty() instead of our own unwrapped versions. 2017-04-20 17:49:26 +00:00
69e0f28333 Merge branch 'obsd-master' 2017-04-20 18:01:12 +01:00
51a0dbb172 Only set up a current target for mouse key bindings. Fixes:
bind q select-pane -U \; resize-pane -Z

(There is still some possible weirdness with the way we do current
targets, it should probably be done in a different way at some point.)
2017-04-20 15:16:20 +00:00
7934e7a6b5 Notes on target resolution. 2017-04-20 15:40:28 +01:00
aebbb15fe2 Turn on debug if $VERSION is master rather than commenting and uncommenting. 2017-04-20 12:06:39 +01:00
48371216df Merge branch 'obsd-master' 2017-04-20 12:01:14 +01:00
e30f9dc1fa Merge tag '2.4'
Version 2.4.
2017-04-20 11:59:07 +01:00
f21cb71fbe Enter date of release. 2.4 2017-04-20 11:52:16 +01:00
990218739a Missing :. 2017-04-20 11:03:23 +01:00
e7c2f53f2a Changes to CHANGES. 2017-04-20 11:00:15 +01:00
21993105e5 Now that struct winlink has a session pointer, can remove some arguments. 2017-04-20 09:43:45 +00:00
9b2f02efbd Update CHANGES file 2017-04-20 10:39:16 +01:00
0f25ad3ca3 There is no real need for window_printable_flags to allocate, make it
return a buffer from the stack.
2017-04-20 09:39:07 +00:00
f9c7c50a93 Update TODO. 2017-04-20 10:20:42 +01:00
0b44ad99b5 If a #() command doesn't exit, use its most recent line of output (it
must be a full line). Don't let it redraw the status line more than once
a second.

Requested by someone about 10 years ago...
2017-04-20 09:20:22 +00:00
78d707dc83 Add to TODO. 2017-04-20 08:53:03 +01:00
b087483538 load_cfg returns < 0 on error, not != 0. Problem reported by Kaushal Modi. 2017-04-19 22:19:22 +01:00
3385159c94 Merge branch 'obsd-master' 2017-04-19 20:01:11 +01:00
f184c6f06c load_cfg returns < 0 on error, not != 0. Problem reported by Kaushal Modi. 2017-04-19 16:59:54 +00:00
5a551ac57f Merge branch 'obsd-master' 2017-04-19 16:01:14 +01:00
53fde21bb8 Add a suspend helper function, and do not allow detaching or suspending
while already doing so.
2017-04-19 14:00:28 +00:00
b946bf43f5 Version 2.4. 2017-04-19 13:51:49 +01:00
d64a815e8d Missed freezero. 2017-04-19 13:50:52 +01:00
689f4bfac2 Style nits and a missing cast. 2017-04-19 12:44:29 +00:00
85af9c9c9d Merge branch 'obsd-master' 2017-04-19 10:01:12 +01:00
95c38087db Missed freezero. 2017-04-19 07:58:45 +01:00