circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-19 19:08:50 +00:00
Code Issues Projects Releases Wiki Activity
5,320 Commits 3 Branches 37 Tags 31 MiB
74b958ecbe
Commit Graph

65 Commits

Author SHA1 Message Date
Thomas Adam
74b958ecbe Merge branch 'obsd-master' 
Conflicts:
	Makefile
 2015-09-14 12:42:19 +01:00
nicm
a3de5dbab1 Merge delete-buffer into cmd-set-buffer.c and change the paste buffer 
API so it has one paste_free() rather than free_top and free_name
(everywhere that uses it already has the right pointer).
 2015-09-11 14:41:50 +00:00
Thomas Adam
cb89f2f2a1 Merge branch 'obsd-master' 
Conflicts:
	Makefile
	format.c
 2015-08-30 21:44:01 +01:00
nicm
373ef850e0 paste_send_pane can be merged into cmd-paste-buffer.c now. 2015-08-29 09:36:46 +00:00
nicm
b569585000 Move struct paste_buffer out of tmux.h. 2015-08-29 09:25:00 +00:00
Thomas Adam
370cf75458 Merge branch 'obsd-master' 2015-04-19 14:44:56 +01:00
nicm
6920be311b When replacing, don't free the old paste until after the new one's name 
has been copied. Fixes a use-after-free in window-copy.c. Bug reported
by J Raynor (who also provided a different fix).
 2015-04-07 13:06:22 +00:00
Thomas Adam
fc05bf255a Merge branch 'obsd-master' 2014-11-09 00:15:51 +00:00
Nicholas Marriott
747cab4281 No need for $Id$ now. 2014-11-08 12:27:43 +00:00
nicm
79f52825b5 Tidy up mode-mouse check. 2014-11-05 23:25:02 +00:00
Thomas Adam
562af864bd Merge branch 'obsd-master' 
Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c
 2014-10-21 07:11:44 +01:00
nicm
a27ba6e380 Add xreallocarray and remove nmemb argument from xrealloc. 2014-10-08 17:35:58 +00:00
nicm
77efcf8bdd Use xrealloc(NULL, n, m) instead of xmalloc(n * m) to get overflow 
check.
 2014-10-08 17:14:04 +00:00
Thomas Adam
2874a431c0 Merge branch 'obsd-master' 2014-09-25 11:29:54 +01:00
nicm
4e956d545a Various minor style and spacing nits. 2014-09-01 21:50:18 +00:00
nicm
e075198049 Don't allow pasting into input-disabled panes, from Anish R Athalye. 2014-08-25 13:13:19 +00:00
Thomas Adam
a131b82e95 Merge branch 'obsd-master' 
Conflicts:
	client.c
 2014-08-09 20:31:36 +01:00
Thomas Adam
814e40522c Merge branch 'obsd-master' 2014-06-20 12:59:43 +01:00
nicm
8d0819bff1 Comment style nits. 2014-06-20 11:00:19 +00:00
nicm
b2e791b574 Don't allow multiple buffers with the same name, from Thomas Adam. 2014-05-13 22:54:18 +00:00
Thomas Adam
bae95844d7 Merge branch 'obsd-master' 
Conflicts:
	format.c
	window.c
 2014-05-13 21:58:48 +01:00
nicm
3dbacbb62b Add support for named buffers. If you don't name a buffer, things work 
much as before - buffers are automatically named "buffer0000",
"buffer0001" and so on and ordered as a stack. Buffers can be named
explicitly when creating ("loadb -b foo" etc) or renamed ("setb -b
buffer0000 -n foo"). If buffers are named explicitly, they are not
deleted when buffer-limit is reached. Diff from J Raynor.
 2014-05-13 07:34:35 +00:00
Thomas Adam
3f54c9292f Merge branch 'obsd-master' 2014-04-24 12:59:00 +01:00
nicm
bec6c807cd There is no longer a need for a paste_stack struct or for global_buffers 
to be global. Move to paste.c.
 2014-04-24 09:14:43 +00:00
Thomas Adam
0c99c7dbff Merge branch 'obsd-master' 
Conflicts:
	Makefile
	tty-keys.c
 2014-04-05 12:36:14 +01:00
nicm
252a7373d6 Support UTF-8 with choose-buffer, from Kosuke ASAMI. Also make 
buffer_sample bigger to let it trim at window right edge.
 2014-04-02 18:12:18 +00:00
nicm
0e4d1d8493 Add setb -a to append and a copy mode append command, from J Raynor with 
minor changes.
 2014-03-31 21:39:31 +00:00
Nicholas Marriott
8c0edcbfa3 Add setb -a to append and a copy mode append command, from J Raynor with minor 
changes.
 2014-03-06 11:50:07 +00:00
Thomas Adam
ca1d78f523 Merge branch 'obsd-master' 2014-02-19 15:05:07 +00:00
nicm
6daf06b1ad Fix memory leaks with paste_replace, based on changes from J Raynor. 2014-02-17 23:07:03 +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
b79f86e32a Trivial code simplification from Tim Ruehsen. 2012-09-04 22:37:31 +01:00
Nicholas Marriott
59c760dfcd Trivial code simplification from Tim Ruehsen. 2012-09-04 13:24:50 +00:00
Tiago Cunha
a432fcd306 Sync OpenBSD patchset 1150: 
xfree is not particularly helpful, remove it. From Thomas Adam.
 2012-07-11 19:34:16 +00:00
Nicholas Marriott
df912e3540 xfree is not particularly helpful, remove it. From Thomas Adam. 2012-07-10 11:53:01 +00:00
Tiago Cunha
391f1f08c0 Expand the Id keyword. 2011-07-09 09:42:33 +00:00
Nicholas Marriott
8ab7fcf7eb |PatchSet 873 
|Date: 2011/03/28 20:44:31
|Author: nicm
|Branch: HEAD
|Tag: (none)
|Log:
|Style: uint -> u_int and a missing else.
 2011-04-06 22:18:56 +00:00
Nicholas Marriott
fa6abac98d Style: uint -> u_int and a missing else. 2011-03-28 19:44:31 +00:00
Nicholas Marriott
cc42614fa9 Change from a per-session stack of buffers to one global stack which is 
much more convenient and also simplifies lot of code. This renders
copy-buffer useless and makes buffer-limit now a server option.

By Tiago Cunha.
 2010-12-30 23:16:18 +00:00
Tiago Cunha
9ebee6aef8 Global paste buffers instead of per-session which renders copy-buffer useless. 
As a consequence buffer-limit is now a server option.
 2010-12-30 22:39:49 +00:00
Tiago Cunha
617386370b Nuke vis.h. 2010-06-22 23:36:54 +00:00
Tiago Cunha
bf1e237410 Sync OpenBSD patchset 726: 
Add a choose-buffer command for easier use of the paste buffer stack.
 2010-06-22 23:35:20 +00:00
Nicholas Marriott
ef7293379f Add a choose-buffer command for easier use of the paste buffer stack. 2010-06-21 21:44:09 +00:00
Tiago Cunha
cc094fdfe6 Sync OpenBSD patchset 581: 
Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last
time now I've configured emacs to make them displayed in really annoying
colours...
 2009-12-04 22:14:47 +00:00
Nicholas Marriott
15a64b805e Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last 
time now I've configured emacs to make them displayed in really annoying
colours...
 2009-12-03 22:50:09 +00:00
Tiago Cunha
fabf40b3b3 Sync OpenBSD patchset 569: 
Tidy up various bits of the paste code, make the data buffer char * and add
comments.
 2009-11-28 14:54:12 +00:00
Nicholas Marriott
8cb410c63c Tidy up various bits of the paste code, make the data buffer char * and add 
comments.
 2009-11-26 22:28:24 +00:00
Tiago Cunha
a090b78e8d Sync OpenBSD patchset 482: 
tv member of struct paste_buffer is updated but not otherwise used, so remove
it.
 2009-11-04 22:39:20 +00:00
Nicholas Marriott
c95f1d1ff9 tv member of struct paste_buffer is updated but not otherwise used, so remove 
it.
 2009-11-03 17:17:24 +00:00