aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmuxNicholas Marriott2012-09-25
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: cmd.c format.c osdep-openbsd.c
| * | Don't rely on "-s ours" for mergingThomas Adam2012-09-24
| | | | | | | | | | | | | | | | | | The ours strategy assumes one subsumes the other -- which isn't the case for the portable version, so for now -- just go back to using the default merge strategy of recursive, and fix-up any conflicts manually.
| * | Merge branch 'obsd-master'Thomas Adam2012-09-24
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd.c format.c osdep-openbsd.c tmux.h
| | * Add control_write_buffer, from George Nachman.Nicholas Marriott2012-09-24
| | |
| * | Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.Nicholas Marriott2012-09-24
| | |
| * | Use ACS characters for choose-tree arrows based on diff from RomainNicholas Marriott2012-09-24
| | | | | | | | | | | | Francoise.
* | | Merge branch 'obsd-master'Thomas2012-09-24
|\ \ \ | | |/ | |/| | | | | | | | | | * obsd-master: Use pgrp of pty fd not pid of immediate child when recovering current working directory (like current process). From Marcel Partap. Use ACS characters for choose-tree arrows based on diff from Romain Francoise.
| * | Use pgrp of pty fd not pid of immediate child when recovering currentNicholas Marriott2012-09-24
| | | | | | | | | | | | working directory (like current process). From Marcel Partap.
| * | Use ACS characters for choose-tree arrows based on diff from RomainNicholas Marriott2012-09-24
| | | | | | | | | | | | Francoise.
* | | Use pgrp of pty fd not pid of immediate child when recovering current workingNicholas Marriott2012-09-24
| | | | | | | | | | | | directory (like current process). From Marcel Partap.
* | | Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.Nicholas Marriott2012-09-24
| |/ |/|
* | Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmuxThomas Adam2012-09-20
|\ \ | | | | | | | | | | | | Conflicts: SYNCING
| * | .+ SYNCING.Thomas Adam2012-09-19
| | |
* | | Add release instructions for new tmux versionsThomas Adam2012-09-20
|/ / | | | | | | | | Document how actual releases will happen. Largely based on tcunha's original notes. Tweaked by me slightly to adapt to git.
* | Add SYNCING documentThomas Adam2012-09-16
| | | | | | | | | | This explains how to keep the tmux and tmux-openbsd repositories in sync with one another during the course of tmux development.
* | Merge branch 'obsd-master'Thomas Adam2012-09-15
|\| | | | | | | Sync from OpenBSD.
| * Handle empty list properly in choose-list, based on fix from Thomas Adam.Nicholas Marriott2012-09-05
| |
| * We can't tell what the terminal has done with a DCS string, so reset theNicholas Marriott2012-09-05
| | | | | | | | cursor and attributes afterwards.
| * Trivial code simplification from Tim Ruehsen.Nicholas Marriott2012-09-04
| |
| * Remove xterm CRA support - support is patchy and it will be done betterNicholas Marriott2012-09-03
| | | | | | | | using margins.
| * Use the right index when adding item in choose-tree, from Thomas Adam.Nicholas Marriott2012-09-03
| |
| * When choosing a pane found by find-window, switch to that pane ratherNicholas Marriott2012-09-03
| | | | | | | | than just the window. Also use a helper function for the inner loop.
| * Rename variables to something a but more understandable.Nicholas Marriott2012-09-03
| |
| * add cmd-choose-list to allow arbitrary options to be selected. FromNicholas Marriott2012-09-03
| | | | | | | | Thomas Adam.
| * Remove an unused variable.Nicholas Marriott2012-09-03
| |
| * Send notifications to control clients. Also don't redraw client whenNicholas Marriott2012-09-03
| | | | | | | | suspended.
| * Change format of choose-tree arrows slightly, from Romain Francoise.Nicholas Marriott2012-09-03
| |
| * If stdin in the client is enable immediately, tmux will eat anythingNicholas Marriott2012-09-03
| | | | | | | | | | | | | | sent to stdin before it is needed, which can be inconvenient (eg pasting commands). Instead, start with stdin disabled and reuse MSG_STDIN from server->client to mean that stdin should be enabled. Based on a diff from Chris Johnsen.
| * Can't call evtimer_pending on uninitialized events, callNicholas Marriott2012-09-03
| | | | | | | | | | evtimer_initialized first. Reported by Vladimir Lomov, fix from Thomas Adam slightly modified by me.
| * Change a log to fprintf that was missed last time around, from Tiago Cunha.Nicholas Marriott2012-08-27
| |
| * Instead of requiring a prompt to enter all numbers >10, go back toNicholas Marriott2012-08-27
| | | | | | | | | | | | 0-9a-z and add A-Z and enter the prompt when M-0 to M-9 are pressed (like in copy mode). Prompted by request from mcbride@, help from Thomas Adam.
| * xterm won't reach version 500 for a while so set that as the upper limit.Nicholas Marriott2012-08-21
| |
| * Fix up window reference counting and don't crash if the rename timerNicholas Marriott2012-08-21
| | | | | | | | | | fires while the window is dead but still referenced. Fixes problem reported by Michael Scholz.
| * Boldify windows with alerts in choose-* list.Nicholas Marriott2012-08-14
| |
| * Tidy up tty_write, from Sean Estabrooks.Nicholas Marriott2012-08-14
| |
| * Use a separate define for each default format template and strip clutterNicholas Marriott2012-08-14
| | | | | | | | from the choose-tree defaults.
| * Add a patch missed during a merge sometime to useNicholas Marriott2012-08-14
| | | | | | | | TAILQ_FOREACH_SAFE. From Tiago Cunha.
| * Simplify width calculation (all numbers always sequential) and don'tNicholas Marriott2012-08-12
| | | | | | | | rely on uninitialized data, from Thomas Adam.
| * Remove dead code, from Sean Estabrooks.Nicholas Marriott2012-08-11
| |
| * Another missing format from sam at sltosis.org.Nicholas Marriott2012-08-11
| |
| * Fix a return type.Nicholas Marriott2012-08-11
| |
| * Instead of numbering choose mode items 0-9a-z and then nothing, numberNicholas Marriott2012-08-11
| | | | | | | | | | them all and if there are more than 10 use a prompt when 0-9 is pressed. From Thomas Adam.
| * Add some missing formats from Samuel Le Thiec.Nicholas Marriott2012-08-11
| |
| * Document pane_index variable, from sam at sltosis dot org.Nicholas Marriott2012-07-15
| |
| * Add a queue of notifys and a way to turn them off and on (we do not wantNicholas Marriott2012-07-13
| | | | | | | | | | notifys to happen during some commands). Based on code from George Nachman.
| * Nuke unused variable from Thomas Adam.Nicholas Marriott2012-07-12
| |
| * Make command exec functions return an enum rather than -1/0/1 values andNicholas Marriott2012-07-11
| | | | | | | | | | | | add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
| * xfree is not particularly helpful, remove it. From Thomas Adam.Nicholas Marriott2012-07-10
| |
| * Move a NULL check inside a function, from Tiago Cunha.Nicholas Marriott2012-07-09
| |
| * Fix choose-tree usage string.Nicholas Marriott2012-07-09
| |
generated by cgit (git 2.34.1) at 2025-06-24 17:27:37 +0000