Thomas Adam
afb3a5fe71
Merge branch 'obsd-master'
2022-06-04 10:01:09 +01:00
nicm
020c403dff
When picking a buffer because one isn't specified by the user, ignore
...
named buffers. GitHub issue 3212 from David le Blanc.
2022-06-04 07:42:07 +00:00
nicm
2df75aa117
Use VIS_CSTYLE for paste buffers also.
2020-05-16 15:35:19 +00:00
nicm
78595457f9
Add 'e' key in buffer mode to open the buffer in an editor.
2020-05-16 15:24:28 +00:00
Nicholas Marriott
bf84359dfb
Use VIS_CSTYLE for paste buffers also.
2020-05-01 17:59:13 +01:00
Nicholas Marriott
cc19203be2
Add 'e' key in buffer mode to open the buffer in an editor.
2020-05-01 09:02:44 +01:00
Thomas Adam
bfc1f0ca62
Merge branch 'obsd-master'
2019-04-02 11:02:44 +01:00
nicm
7bcc0d16f2
Add an argument to copy commands to set the prefix for the buffer name,
...
allows buffers for different sessions to be named separately.
2019-04-02 09:03:39 +00:00
Thomas Adam
f1282a683d
Merge branch 'obsd-master'
2017-01-24 14:01:15 +00:00
nicm
3d74e89a39
Shorten a long line, and don't leak buffer in paste_add if size is zero.
2017-01-24 13:28:33 +00:00
Thomas Adam
6551f4bb3b
Merge branch 'obsd-master'
...
Conflicts:
paste.c
2016-10-13 08:09:47 +01:00
nicm
22a8afee9e
Unused variable and missing time.h.
2016-10-12 09:07:58 +00:00
Thomas Adam
12efb40dc5
Linux: #include <time.h> for time()
2016-10-12 09:53:30 +01:00
Thomas Adam
b9dc855016
Merge branch 'obsd-master'
...
Conflicts:
format.c
osdep-openbsd.c
2016-10-12 09:45:49 +01:00
nicm
5c49e1d0c1
Some other stuff that can be local to one file.
2016-10-11 13:45:47 +00:00
Thomas Adam
226b6a2192
Merge branch 'obsd-master'
2016-10-10 16:01:12 +01:00
nicm
7d4b416fe6
Some more static.
2016-10-10 13:54:47 +00:00
Thomas Adam
5b8f033e06
Merge branch 'obsd-master'
2016-10-05 14:01:10 +01:00
nicm
4117a7ed19
Keep buffer creation time and add accessors for it and the order number.
2016-10-05 12:34:05 +00:00
Thomas Adam
dc42c35f1f
Merge branch 'obsd-master'
2016-01-19 18:01:15 +00:00
nicm
995af0e2b7
I no longer use my SourceForge address so replace it.
2016-01-19 15:59:12 +00:00
Thomas Adam
5f483499f3
Merge branch 'obsd-master'
2015-11-12 12:01:17 +00:00
nicm
1b86f520ea
Nuke the utf8 and status-utf8 options and make tmux only a UTF-8
...
terminal. We still support non-UTF-8 terminals outside tmux, but inside
it is always UTF-8 (as when the utf8 and status-utf8 options were on).
2015-11-12 11:09:11 +00:00
Thomas Adam
da1f6fc2c8
Merge branch 'obsd-master'
...
Conflicts:
Makefile
client.c
server-client.c
server.c
tmux.c
tmux.h
2015-10-27 23:27:26 +00:00
nicm
44657bf932
Move struct options into options.c.
2015-10-27 15:58:42 +00:00
Thomas Adam
b5d789a531
Merge branch 'obsd-master'
2015-09-14 16:01:08 +01:00
nicm
16ee4de5df
Remove some extra blank lines.
2015-09-14 13:22:02 +00:00
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