Commit Graph

6120 Commits

Author SHA1 Message Date
c9fcb76651 Merge branch 'obsd-master' 2017-01-15 22:01:11 +00:00
3054846143 -q flag now needs to be checked in a couple more places. 2017-01-15 20:50:34 +00:00
2b0bc9f1c5 Major tidy up and rework of options tree and set-option/show-options
commands this pushes more of the code into options.c and ties it more
closely to the options table rather than having an unnecessary
split. Also add support for array options (will be used later). Only
(intentional) user visible change is that show-options output is now
passed through vis(3) with VIS_DQ so quotes are escaped.
2017-01-15 20:48:41 +00:00
404214b0ac Remove unused quiet option. 2017-01-15 20:16:22 +00:00
a3cf995017 Append needs to go old,new not new,old... 2017-01-15 20:14:36 +00:00
4f077fe62c Merge branch 'obsd-master' 2017-01-14 20:01:13 +00:00
e06efab9da killp -a should not kill the window if only one pane. 2017-01-14 18:53:08 +00:00
780dd7ac82 Merge branch 'obsd-master' 2017-01-13 14:01:13 +00:00
2311bbd28a Merge branch 'obsd-master' 2017-01-13 12:01:12 +00:00
08d21936e4 options_get_style return const too. 2017-01-13 11:58:49 +00:00
22a528905d Make options_get_string return const string. 2017-01-13 11:56:43 +00:00
95950bf668 Add -E to detach-client to exec a command to replace the client instead
of exiting it, useful if tmux wasn't exec'd itself. From Jenna Magius.
2017-01-13 10:12:12 +00:00
d4cb178249 Merge branch 'obsd-master' 2017-01-12 16:01:13 +00:00
24cba5907b Simplify appending to string options. 2017-01-12 15:36:35 +00:00
1eb9500644 Merge branch 'obsd-master' 2017-01-12 12:01:10 +00:00
dad3090d32 Put all palette functions together in the file. 2017-01-12 10:15:55 +00:00
4a76861925 Merge branch 'obsd-master' 2017-01-12 02:01:11 +00:00
9b6aeacdc0 aixterm colours can be used if -2 is given, as well as if TERM tells us
the terminal has >=16 colours.
2017-01-12 00:30:41 +00:00
0752fdaf6a Erm the aixterm colours should start at 8, not 7. 2017-01-12 00:24:28 +00:00
9e786030df Fix setting the palette of aixterm colours (90-97). 2017-01-12 00:19:32 +00:00
33ebb9ec39 Merge branch 'obsd-master' 2017-01-12 00:01:13 +00:00
74c40d04ea Be less aggressive about turning margins off. 2017-01-11 23:10:04 +00:00
3bb14001b9 Add some missing special keys to key_string_lookup_key, fix a mouse
check in server_client_handle_key, and tweak a comment.
2017-01-11 22:36:07 +00:00
d87ab0cadf Merge branch 'obsd-master' 2017-01-11 18:01:13 +00:00
bf6a5c056d Add a format for terminal type. 2017-01-11 16:09:57 +00:00
7497ecd979 Use a macro for looking up tty types. 2017-01-11 16:05:46 +00:00
0d19d78fff Merge branch 'obsd-master' 2017-01-11 16:01:16 +00:00
458b6eb600 Some tidying and tweaks to options code. 2017-01-11 14:56:44 +00:00
8f79b079cd Merge branch 'obsd-master' 2017-01-10 22:01:14 +00:00
db8dff6814 Merge branch 'obsd-master' 2017-01-10 20:01:12 +00:00
5526627558 Minor tidying in a couple of commands. 2017-01-10 19:45:55 +00:00
ba35e8f292 15 minutes is not 1800 seconds, but just remove lock-after-time because it won't work for Linux folks without additional configuration 2017-01-10 19:33:22 +00:00
2283f19876 -temacs-copy should now be -Tcopy-mode 2017-01-10 19:31:34 +00:00
152bfa02f0 Merge branch 'master' of github.com:tmux/tmux 2017-01-10 19:27:23 +00:00
a5c89a1802 Change around the example .tmux.conf to show some newer features. 2017-01-10 19:26:54 +00:00
aa4de2d4b2 Need to escape ; twice because the command list parser will eat one,
reported by Theo Buehler.
2017-01-10 18:10:24 +00:00
570943beb7 Merge branch 'obsd-master' 2017-01-10 14:01:12 +00:00
1e12e1d843 Merge branch 'obsd-master' 2017-01-10 12:01:10 +00:00
5ea7a00eba Quote backslash as well for %%%. 2017-01-10 11:58:30 +00:00
e78142232f Some manpage fixes: rephrase a convoluted sentence, make the names of
some keys more standard, and use Ql instead of Dq.
2017-01-10 10:08:59 +00:00
628f3ad9f4 Merge branch 'obsd-master' 2017-01-10 10:01:11 +00:00
jmc
40fddfbdd6 avoid unneccessary markup; tweaked and ok nicm 2017-01-10 07:55:48 +00:00
2c862b04af Merge branch 'obsd-master' 2017-01-09 22:01:12 +00:00
36619607ba Add a format for the version. 2017-01-09 21:44:19 +00:00
d2d984647e Add %if/%endif for conditionals when parsing configuration files, the
argument is a format (the new == and != are useful).
2017-01-09 21:28:56 +00:00
844f2eacf4 Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b"
are expanded so can compare formats). And expand the condition to
#{?a,b,c} (the "a" part) if it doesn't work as a simple lookup.

Also add FORMAT_NOJOBS flag to disable jobs in a format.
2017-01-09 21:03:25 +00:00
95f5d406e5 Merge branch 'obsd-master' 2017-01-09 20:01:12 +00:00
561b5c6fdb source-file -q needs to apply to glob(3) too. 2017-01-09 19:29:12 +00:00
5330a2a85d Run the source-file pattern through glob(3). 2017-01-09 19:27:00 +00:00
d90fa2ec13 Tweak TODO file. 2017-01-09 17:48:30 +00:00