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

4133 Commits (739a76634c956016c44a89530d8ee9d20c4ed9f0)

Author SHA1 Message Date
Thomas Adam 739a76634c Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-27 22:24:00 +00:00
Nicholas Marriott 47c097cb51 Support middle-click paste, based on a diff from Ailin Nemui. 2012-11-27 20:22:12 +00:00
Nicholas Marriott 24d7d073ff Support the 47 and 1047 SM and RM sequences (alternate screen without 
cursor), requested by I forget who ages ago.
 2012-11-27 20:08:42 +00:00
Thomas Adam 39631edb98 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-27 18:12:04 +00:00
Nicholas Marriott 9b8998aeec Correctly aggregate together errors from nested config files (with 
source-file). Fix by Thomas Adam, reported by Sam Livingstone-Gray
 2012-11-27 16:12:29 +00:00
Nicholas Marriott 4aa4e9fb26 Allow cmd-run-shell to accept -t to specify the pane to display the 
output, requested by Alexander Tsepkov.
 2012-11-27 15:09:35 +00:00
Nicholas Marriott 1fcc7f50ac When scrolling in copy mode with the mouse, scroll screen rather than 
moving cursor. This change from Ailin Nemui, alternative to a change
from Stephen Hicks.
 2012-11-27 14:42:56 +00:00
Nicholas Marriott 6ef4f8e16c Revert last, after discussion it isn't necessary. 2012-11-27 14:26:48 +00:00
Nicholas Marriott 93224260ae Add window-status-last-* options, from Boris Faure. 2012-11-27 13:52:23 +00:00
Nicholas Marriott 991bfcf443 Fix session choice so that preferring unattached sessions actually 
works, reported by Drew Frank.
 2012-11-27 09:20:03 +00:00
Nicholas Marriott d762ced298 Call realpath earlier on the socket directory path rather than on the 
socket file path because the latter may not exist yet and in that case
realpath is allowed to fail. From Romain Francoise.
 2012-11-26 11:35:28 +00:00
Thomas Adam 1bc910a963 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-22 22:19:04 +00:00
Nicholas Marriott 63f451965c Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux 2012-11-22 16:48:50 +00:00
Nicholas Marriott 260419f48e Put helper function back, will be needed in a bit. 2012-11-22 14:41:11 +00:00
Thomas Adam c04aa90207 Merge branch 'obsd-master' 
Sync from OpenBSD.

* obsd-master:
  Add halfpage commands to mode command string table (missed by accident), from Thomas Adam.
  Clarify some points about config files, notably that they are only read at server start. From Thomas Adam.
  Use a utility function for common code to show errors in config file, from Thomas Adam.
 2012-11-22 13:24:14 +00:00
Nicholas Marriott 0679eb6a6d Add halfpage commands to mode command string table (missed by accident), 
from Thomas Adam.
 2012-11-19 10:51:25 +00:00
Nicholas Marriott 9a7e5bd1d3 Clarify some points about config files, notably that they are only read 
at server start. From Thomas Adam.
 2012-11-19 10:50:24 +00:00
Nicholas Marriott 827b311c81 Use a utility function for common code to show errors in config file, 
from Thomas Adam.
 2012-11-19 10:38:06 +00:00
Thomas Adam e4679172e3 Sanitise additional .mailmap entries 
This sanitises multiple author addresses some more, mapping them back to one
common entity.
 2012-11-08 21:39:35 +00:00
Thomas Adam be10e8eee6 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-08 21:27:40 +00:00
Thomas Adam cb4553bd06 Add .mailmap for commit author translations 
Because it's not possible to enumerate up-front all of the committers to
tmux coming from OpenBSD, at the time a commit is imported in to git from
the OpenBSD CVS repository, the author information is not known to Git,
necessarily.

But it's possible to alter for output the respective author after the fact,
via Git's .mailmap file.  It is this file which will therefore provide a new
mapping of OpenBSD commiter to an actual real name and real email address.
 2012-11-08 21:14:32 +00:00
Nicholas Marriott c68efec6c0 Show last client activity time in default choose-client list. 2012-11-05 13:13:04 +00:00
Thomas Adam a75801320d Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-04 01:27:57 +00:00
okan 241a746f32 fix an off-by-one 
ok nicm@
 2012-10-31 19:11:18 +00:00
Thomas Adam 47fbf87185 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-26 20:28:58 +01:00
Nicholas Marriott d210d99cce Make mouse event structure clearer by defining events (up, click, drag) 
and simplifying how buttons and wheels are represented, from Ailin
Nemui. Should be no functional changes.
 2012-10-26 14:35:42 +00:00
Thomas Adam 31f93d8445 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-25 23:32:14 +01:00
Nicholas Marriott 2a609b332f Add ability to active pane in list-windows and find-window formats, from 
Carl Henrik Lunde.
 2012-10-25 11:26:47 +00:00
Nicholas Marriott 18236c1c1b Fix BELL_NONE which had been broken in some code reorganisation or other 
also don't redraw unnecessarily. From Seiji Ohashi.
 2012-10-25 11:16:53 +00:00
Nicholas Marriott 596e9d8068 Fix bad size in memcpy from Romain Francoise. 2012-10-25 11:14:46 +00:00
Nicholas Marriott 589b4b8c6a Fix typo bell->bells from Thomas Adam. 2012-10-25 11:11:58 +00:00
Nicholas Marriott 60808bbded +. 2012-10-23 18:47:52 +01:00
Thomas Adam d4dc52ec84 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-16 18:30:36 +01:00
Nicholas Marriott c695c0c085 Fix some function prototypes from Helmut Tessarek. 2012-10-15 21:53:30 +00:00
Nicholas Marriott a91c598971 Link to git instructions from index.html. 2012-10-15 18:25:44 +01:00
Thomas Adam bf45619441 Don't push all tags when releasing tmux 
Pushing all tags with "git push --tags" will also transfer tags from the
tmux-openbsd repository which isn't what we want to do!

Therefore, just specify the newly created tag to push instead for the next
release.
 2012-10-13 13:35:35 +01:00
Thomas Adam 9b2aabb752 Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux 2012-10-13 12:25:08 +01:00
Thomas Adam c0fb5edff9 Update website. 2012-10-13 12:22:11 +01:00
Thomas Adam 5cdc9591d3 Working on 1.8 2012-10-13 12:12:43 +01:00
Thomas Adam 2b5c3fc49f Update NOTES, CHANGES, configure.ac for 1.7 release 2012-10-13 11:56:14 +01:00
Thomas Adam b4ad1759b8 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-11 17:52:23 +01:00
Nicholas Marriott 6589120667 Fix a use-after-free when collapsing the tree in choose mode, from 
Carl Henrik Lunde.
 2012-10-11 08:53:50 +00:00
Thomas Adam 0cdcae3532 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-09 20:47:28 +01:00
Nicholas Marriott 0e87430462 Add tree keys to vi mode too, missed by accident. 2012-10-09 18:08:21 +00:00
Thomas Adam 43d2b6a648 Remove references to PATCHES file 2012-10-07 10:57:11 +01:00
Nicholas Marriott 8249fbfb60 Make some tweaks to NOTES and add a paragraph on git rather than huge PATCHES 
file.
 2012-10-05 09:05:44 +01:00
Thomas Adam 3a545376f0 Reference PATCHES document from TODO file 
In terms of submitting patches via the TODO file from the tmux portable
repository, mention the PATCHES file in passing.
 2012-10-05 00:19:53 +01:00
Thomas Adam 5cc9380bfa Add PATCHES document 
This describes how to send patches against the portable tmux version as
hosted on souceforge, using Git.
 2012-10-05 00:18:50 +01:00
Thomas Adam ca84659ca1 Add explanatory sections to TODO file 
This restructures the TODO file slightly, separating out the
terminal-specific tasks from the tmux user interface tasks.
 2012-10-04 23:57:31 +01:00
Thomas Adam 8dc78377d1 +. 2012-10-04 22:45:22 +01:00