aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Update NOTES, CHANGES, configure.ac for 1.7 releaseThomas Adam2012-10-13
|
* Merge branch 'obsd-master'Thomas Adam2012-10-11
|\ | | | | | | Sync from OpenBSD.
| * Fix a use-after-free when collapsing the tree in choose mode, fromNicholas Marriott2012-10-11
| | | | | | | | Carl Henrik Lunde.
* | Merge branch 'obsd-master'Thomas Adam2012-10-09
|\| | | | | | | Sync from OpenBSD.
| * Add tree keys to vi mode too, missed by accident.Nicholas Marriott2012-10-09
| |
* | Remove references to PATCHES fileThomas Adam2012-10-07
| |
* | Make some tweaks to NOTES and add a paragraph on git rather than huge PATCHESNicholas Marriott2012-10-05
| | | | | | | | file.
* | Reference PATCHES document from TODO fileThomas Adam2012-10-05
| | | | | | | | | | In terms of submitting patches via the TODO file from the tmux portable repository, mention the PATCHES file in passing.
* | Add PATCHES documentThomas Adam2012-10-05
| | | | | | | | | | This describes how to send patches against the portable tmux version as hosted on souceforge, using Git.
* | Add explanatory sections to TODO fileThomas Adam2012-10-04
| | | | | | | | | | This restructures the TODO file slightly, separating out the terminal-specific tasks from the tmux user interface tasks.
* | +.Thomas Adam2012-10-04
| |
* | Add choose-list to tmux.vimThomas Adam2012-10-02
| |
* | Update TODO list.Thomas Adam2012-10-02
| | | | | | | | Keeping this in sync with work done.
* | Merge branch 'obsd-master'Thomas Adam2012-10-02
|\| | | | | | | | | | | | | | | Sync from OpenBSD. * obsd-master: Allow session tree (C-b s) to expand and collapse sessions with left/right/space keys. From Thomas Adam. Remove some out of date text from man page, from Thomas Adam.
| * Allow session tree (C-b s) to expand and collapse sessions withNicholas Marriott2012-10-02
| | | | | | | | left/right/space keys. From Thomas Adam.
| * Remove some out of date text from man page, from Thomas Adam.Nicholas Marriott2012-10-02
| |
* | Merge branch 'obsd-master'Thomas Adam2012-10-01
|\|
| * Do not test client flags against TTY_FREEZE bit, reported by Tom Ryder.Nicholas Marriott2012-09-29
| |
* | Merge branch 'obsd-master'Thomas2012-09-27
|\| | | | | | | | | | | | | Sync from OpenBSD. * obsd-master: Do not leak file descriptor if not a tty, reported by Sebastien Marie.
| * Do not leak file descriptor if not a tty, reported by Sebastien Marie.Nicholas Marriott2012-09-27
| |
* | Merge branch 'obsd-master'Thomas Adam2012-09-25
|\| | | | | | | Sync from OpenBSD.
| * Add notification for input from a pane, from George Nachman.Nicholas Marriott2012-09-25
| |
| * Fix search forward so it can match strings on the last line, SF bugNicholas Marriott2012-09-25
| | | | | | | | 3571114 from "LiJunLe".
* | Fix up missing bits.Nicholas Marriott2012-09-25
| |
* | 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.