circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,192 Commits 1 Branch 35 Tags 65 MiB
Commit Graph

6192 Commits

Author SHA1 Message Date
Thomas Adam 8f79b079cd Merge branch 'obsd-master' 2017-01-10 22:01:14 +00:00
Thomas Adam db8dff6814 Merge branch 'obsd-master' 2017-01-10 20:01:12 +00:00
nicm 5526627558 Minor tidying in a couple of commands. 2017-01-10 19:45:55 +00:00
Nicholas Marriott 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
Nicholas Marriott 2283f19876 -temacs-copy should now be -Tcopy-mode 2017-01-10 19:31:34 +00:00
Nicholas Marriott 152bfa02f0 Merge branch 'master' of github.com:tmux/tmux 2017-01-10 19:27:23 +00:00
Nicholas Marriott a5c89a1802 Change around the example .tmux.conf to show some newer features. 2017-01-10 19:26:54 +00:00
nicm 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
Thomas Adam 570943beb7 Merge branch 'obsd-master' 2017-01-10 14:01:12 +00:00
Thomas Adam 1e12e1d843 Merge branch 'obsd-master' 2017-01-10 12:01:10 +00:00
nicm 5ea7a00eba Quote backslash as well for %%%. 2017-01-10 11:58:30 +00:00
nicm 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
Thomas Adam 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
Thomas Adam 2c862b04af Merge branch 'obsd-master' 2017-01-09 22:01:12 +00:00
Nicholas Marriott 36619607ba Add a format for the version. 2017-01-09 21:44:19 +00:00
nicm 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
nicm 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
Thomas Adam 95f5d406e5 Merge branch 'obsd-master' 2017-01-09 20:01:12 +00:00
nicm 561b5c6fdb source-file -q needs to apply to glob(3) too. 2017-01-09 19:29:12 +00:00
nicm 5330a2a85d Run the source-file pattern through glob(3). 2017-01-09 19:27:00 +00:00
Nicholas Marriott d90fa2ec13 Tweak TODO file. 2017-01-09 17:48:30 +00:00
Thomas Adam 325c85a5c1 Merge branch 'obsd-master' 2017-01-07 18:01:11 +00:00
Thomas Adam 29e64a8c64 Merge branch 'obsd-master' 2017-01-07 16:01:17 +00:00
nicm c05002b0f2 Add note about ccc and initc so people who want it can see it is 
possible.
 2017-01-07 15:40:23 +00:00
nicm 314e933914 Add support for the OSC 4 and OSC 104 palette setting escape sequences, 
from S Gilles.
 2017-01-07 15:28:13 +00:00
Thomas Adam a3428487a7 Merge branch 'obsd-master' 2017-01-06 14:01:15 +00:00
nicm cae0fbbe8c Nits found with clang. 2017-01-06 13:26:09 +00:00
nicm 461217d0f0 Incremental search in copy mode (on for emacs keys by default) - much 
the same as normal searching but updates the cursor position and marked
search terms as you type. C-r and C-s in the prompt repeat the search,
once finished searching (with Enter), N and n work as before.
 2017-01-06 11:57:03 +00:00
Thomas Adam 58642011df Merge branch 'obsd-master' 2017-01-05 10:01:11 +00:00
nicm 9a56671a75 Highlight all occurrences of search string after searching in copy mode. 2017-01-05 09:07:15 +00:00
Thomas Adam 45dbbb78b0 Merge branch 'obsd-master' 2017-01-03 00:01:12 +00:00
nicm 43e8f60bc6 Escape backspace for capture-pane -P, from George Nachman. 2017-01-02 22:42:19 +00:00
Thomas Adam f5c5847788 Merge branch 'obsd-master' 2016-12-30 16:01:15 +00:00
nicm 1015b124d5 Change the xterm-keys option to default to on, so that tmux will 
generate xterm(1) escape sequences for function keys with modifiers.

With the option off most of these keys are ignored by default, except
for ctrl + arrows which use a variant that nothing else seems to use and
I don't remember why we chose. The xterm escape sequences are now the
most common.

Prompted by a question from mpi@.
 2016-12-30 13:49:34 +00:00
Thomas Adam d3328a3b1e Merge branch 'obsd-master' 2016-12-28 12:01:14 +00:00
nicm 70ba3c147f Fix the prefer unattached session behaviour of 
attach-session/switch-client, reported by Thomas Sattle.
 2016-12-28 10:34:34 +00:00
Nicholas Marriott af56e50f74 utempter is no longer the default, and mention ncurses. 2016-12-20 16:28:11 +00:00
Thomas Adam 00445ebadd Merge branch 'obsd-master' 2016-12-14 20:01:11 +00:00
nicm e36f932f62 Fix up winlink lists after swap-window. 2016-12-14 17:38:59 +00:00
Thomas Adam dda701d95f Merge branch 'obsd-master' 2016-12-12 02:01:27 +00:00
nicm b851c628f4 -N without arguments needs to set prefix count for the mode command, so 
that M-1 etc work. Reported by Theo Buehler.
 2016-12-11 22:55:25 +00:00
Thomas Adam a64b7cfe5d Merge branch 'obsd-master' 2016-12-10 00:01:11 +00:00
nicm bee95bf378 Spacing nits. 2016-12-09 21:39:27 +00:00
Thomas Adam 75135ded09 Merge branch 'obsd-master' 2016-12-09 00:01:12 +00:00
nicm 2a7b4bb017 Fix send-keys with UTF-8. 2016-12-08 22:15:37 +00:00
Thomas Adam d3ede11212 Merge branch 'obsd-master' 2016-12-08 00:01:10 +00:00
nicm 5819d2a9d7 Do not clear the prompt when a message is shown, just leave it around and 
return to it when the message is finished.
 2016-12-07 23:03:04 +00:00
Thomas Adam b9fa8f12d7 Merge branch 'obsd-master' 2016-12-07 10:01:12 +00:00
nicm 5ea143f521 Only skip moving the cursor if it is already in the last position _on 
the same line_, fixes redraw bug reported by patrick keshishian.
 2016-12-07 09:16:55 +00:00