aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge branch 'obsd-master'Thomas Adam2017-01-11
|\|
| * Add a format for terminal type.nicm2017-01-11
| |
| * Use a macro for looking up tty types.nicm2017-01-11
| |
* | Merge branch 'obsd-master'Thomas Adam2017-01-11
|\|
| * Some tidying and tweaks to options code.nicm2017-01-11
| |
* | Merge branch 'obsd-master'Thomas Adam2017-01-10
|\|
| * Minor tidying in a couple of commands.nicm2017-01-10
| |
* | Merge branch 'obsd-master'Thomas Adam2017-01-10
|\|
| * Need to escape ; twice because the command list parser will eat one,nicm2017-01-10
| | | | | | | | reported by Theo Buehler.
* | 15 minutes is not 1800 seconds, but just remove lock-after-time because it ↵Nicholas Marriott2017-01-10
| | | | | | | | won't work for Linux folks without additional configuration
* | -temacs-copy should now be -Tcopy-modeNicholas Marriott2017-01-10
| |
* | Merge branch 'master' of github.com:tmux/tmuxNicholas Marriott2017-01-10
|\ \
| * | Merge branch 'obsd-master'Thomas Adam2017-01-10
| |\|
| | * Quote backslash as well for %%%.nicm2017-01-10
| | |
| * | Merge branch 'obsd-master'Thomas Adam2017-01-10
| |\|
| | * Some manpage fixes: rephrase a convoluted sentence, make the names ofnicm2017-01-10
| | | | | | | | | | | | some keys more standard, and use Ql instead of Dq.
| * | Merge branch 'obsd-master'Thomas Adam2017-01-10
| |\|
| | * avoid unneccessary markup; tweaked and ok nicmjmc2017-01-10
| | |
* | | Change around the example .tmux.conf to show some newer features.Nicholas Marriott2017-01-10
|/ /
* | Merge branch 'obsd-master'Thomas Adam2017-01-09
|\|
| * Add %if/%endif for conditionals when parsing configuration files, thenicm2017-01-09
| | | | | | | | argument is a format (the new == and != are useful).
| * Add simple comparisons in formats: #{==:a,b} and #{!=:a,b} ("a" and "b"nicm2017-01-09
| | | | | | | | | | | | | | 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.
* | Add a format for the version.Nicholas Marriott2017-01-09
| |
* | Merge branch 'obsd-master'Thomas Adam2017-01-09
|\|
| * source-file -q needs to apply to glob(3) too.nicm2017-01-09
| |
| * Run the source-file pattern through glob(3).nicm2017-01-09
| |
* | Tweak TODO file.Nicholas Marriott2017-01-09
| |
* | Merge branch 'obsd-master'Thomas Adam2017-01-07
|\|
| * Add note about ccc and initc so people who want it can see it isnicm2017-01-07
| | | | | | | | possible.
* | Merge branch 'obsd-master'Thomas Adam2017-01-07
|\|
| * Add support for the OSC 4 and OSC 104 palette setting escape sequences,nicm2017-01-07
| | | | | | | | from S Gilles.
* | Merge branch 'obsd-master'Thomas Adam2017-01-06
|\|
| * Nits found with clang.nicm2017-01-06
| |
| * Incremental search in copy mode (on for emacs keys by default) - muchnicm2017-01-06
| | | | | | | | | | | | 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.
* | Merge branch 'obsd-master'Thomas Adam2017-01-05
|\|
| * Highlight all occurrences of search string after searching in copy mode.nicm2017-01-05
| |
* | Merge branch 'obsd-master'Thomas Adam2017-01-03
|\|
| * Escape backspace for capture-pane -P, from George Nachman.nicm2017-01-02
| |
* | Merge branch 'obsd-master'Thomas Adam2016-12-30
|\|
| * Change the xterm-keys option to default to on, so that tmux willnicm2016-12-30
| | | | | | | | | | | | | | | | | | | | | | 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@.
* | Merge branch 'obsd-master'Thomas Adam2016-12-28
|\|
| * Fix the prefer unattached session behaviour ofnicm2016-12-28
| | | | | | | | attach-session/switch-client, reported by Thomas Sattle.
* | utempter is no longer the default, and mention ncurses.Nicholas Marriott2016-12-20
| |
* | Merge branch 'obsd-master'Thomas Adam2016-12-14
|\|
| * Fix up winlink lists after swap-window.nicm2016-12-14
| |
* | Merge branch 'obsd-master'Thomas Adam2016-12-12
|\|
| * -N without arguments needs to set prefix count for the mode command, sonicm2016-12-11
| | | | | | | | that M-1 etc work. Reported by Theo Buehler.
* | Merge branch 'obsd-master'Thomas Adam2016-12-10
|\|
| * Spacing nits.nicm2016-12-09
| |
* | Merge branch 'obsd-master'Thomas Adam2016-12-09
|\|