circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity
4,153 Commits 3 Branches 37 Tags
de194016ec345db2a2a3e0b0d69080e288623597
Commit Graph

4153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Adam
de194016ec Merge branch 'obsd-master' 2013-01-17 01:38:21 +00:00
Nicholas Marriott
e33ba57c13 Remove the layout undo/redo code which never really worked. 2013-01-17 00:11:22 +00:00
Nicholas Marriott
44f8e1caff Implement ECH (erase character, CSI X). Reported by Christian Neukirchen. 2013-01-15 23:18:55 +00:00
Nicholas Marriott
bc2e4a36df If timing between keys is less than (by default) 1 millisecond, assume 
the text is being pasted. assume-paste-time option changes the value (0
disables). Based on a diff from Marcin Kulik.
 2013-01-15 22:55:29 +00:00
Thomas Adam
675c6b3773 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-12-31 18:50:37 +00:00
Tiago Cunha
f4472c16b2 Fix keyword matching. 
Per the documentation in *:syn-keyword* (in particular *E789*), the
optional characters inside the square brackets can only be used in the
end. Therefore, unfold some keywords which were being wrongly
recognised.

Noticed by Bruce Wolk.
 2012-12-24 17:18:35 +00:00
Nicholas Marriott
854e8ae04d Add ^ and $ special command targets to select lowest and highest 
numbered windows, from Raghavendra D Prabhu.
 2012-12-24 12:38:57 +00:00
Nicholas Marriott
3e6d45acf6 Add -T option to select-window to toggle to last window if already 
current, from Raghavendra D Prabhu.
 2012-12-24 12:34:32 +00:00
Nicholas Marriott
a2c8af97e9 Add missing function prototype. 2012-12-24 12:33:05 +00:00
Nicholas Marriott
b18ff67646 Add a -u flag to choose-tree to start uncollapsed, from Raghavendra D 
Prabhu.
 2012-12-24 12:25:52 +00:00
millert
6a5adfc0ba We no longer use struct eproc for kinfo_proc in sysctl.h so there 
is no direct need for sys/proc.h or sys/resource.h.  Some consumers
of kinfo_proc need these for the proc flags and rlimit defines like
RLIM_INF so add the appropriate includes to them.
OK deraadt@ sthen@
 2012-12-18 21:28:45 +00:00
Nicholas Marriott
9714880283 Change load_cfg to fix a crash reported by jasper. 2012-12-13 15:36:16 +00:00
Nicholas Marriott
3a0016a78a Use the CMD_*_USAGE defines consistently, from Thomas Adam. 2012-12-09 23:17:35 +00:00
Thomas Adam
fb83914bd7 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-12-08 20:29:37 +00:00
Thomas Adam
d5de489dc4 .+ 2012-12-08 19:16:45 +00:00
Nicholas Marriott
3fa4f691e3 Handle resetting 256-colours properly when parsing #[default], 
#[fg=default] and #[bg=default] styles.
 2012-12-08 17:05:57 +00:00
Nicholas Marriott
8600fe054b Use strlcat not strncat in load_cfg and some other trivial tidying from 
Tiago Cunha.
 2012-12-06 13:06:05 +00:00
Nicholas Marriott
8378be03d1 Fix argument order in a log statement. 2012-12-06 12:49:13 +00:00
Nicholas Marriott
51a1dbfe09 Simplify command string parsing with a helper function from Tiago Cunha. 2012-12-06 12:47:48 +00:00
Nicholas Marriott
8264e92b37 Fix return value of load_cfg, from Thomas Adam. 2012-11-27 22:59:34 +00:00
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