aboutsummaryrefslogtreecommitdiff
path: root/paste.c
Commit message (Collapse)AuthorAge
* Merge branch 'obsd-master'Thomas Adam2017-01-24
|\
| * Shorten a long line, and don't leak buffer in paste_add if size is zero.nicm2017-01-24
| |
* | Merge branch 'obsd-master'Thomas Adam2016-10-13
|\| | | | | | | | | Conflicts: paste.c
| * Unused variable and missing time.h.nicm2016-10-12
| |
* | Linux: #include <time.h> for time()Thomas Adam2016-10-12
| |
* | Merge branch 'obsd-master'Thomas Adam2016-10-12
|\| | | | | | | | | | | Conflicts: format.c osdep-openbsd.c
| * Some other stuff that can be local to one file.nicm2016-10-11
| |
* | Merge branch 'obsd-master'Thomas Adam2016-10-10
|\|
| * Some more static.nicm2016-10-10
| |
* | Merge branch 'obsd-master'Thomas Adam2016-10-05
|\|
| * Keep buffer creation time and add accessors for it and the order number.nicm2016-10-05
| |
* | Merge branch 'obsd-master'Thomas Adam2016-01-19
|\|
| * I no longer use my SourceForge address so replace it.nicm2016-01-19
| |
* | Merge branch 'obsd-master'Thomas Adam2015-11-12
|\|
| * Nuke the utf8 and status-utf8 options and make tmux only a UTF-8nicm2015-11-12
| | | | | | | | | | 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).
* | Merge branch 'obsd-master'Thomas Adam2015-10-27
|\| | | | | | | | | | | | | | | | | | | Conflicts: Makefile client.c server-client.c server.c tmux.c tmux.h
| * Move struct options into options.c.nicm2015-10-27
| |
* | Merge branch 'obsd-master'Thomas Adam2015-09-14
|\|
| * Remove some extra blank lines.nicm2015-09-14
| |
* | Merge branch 'obsd-master'Thomas Adam2015-09-14
|\| | | | | | | | | Conflicts: Makefile
| * Merge delete-buffer into cmd-set-buffer.c and change the paste buffernicm2015-09-11
| | | | | | | | | | API so it has one paste_free() rather than free_top and free_name (everywhere that uses it already has the right pointer).
* | Merge branch 'obsd-master'Thomas Adam2015-08-30
|\| | | | | | | | | | | Conflicts: Makefile format.c
| * paste_send_pane can be merged into cmd-paste-buffer.c now.nicm2015-08-29
| |
| * Move struct paste_buffer out of tmux.h.nicm2015-08-29
| |
* | Merge branch 'obsd-master'Thomas Adam2015-04-19
|\|
| * When replacing, don't free the old paste until after the new one's namenicm2015-04-07
| | | | | | | | | | has been copied. Fixes a use-after-free in window-copy.c. Bug reported by J Raynor (who also provided a different fix).
* | Merge branch 'obsd-master'Thomas Adam2014-11-09
|\|
| * Tidy up mode-mouse check.nicm2014-11-05
| |
* | No need for $Id$ now.Nicholas Marriott2014-11-08
| |
* | Merge branch 'obsd-master'Thomas Adam2014-10-21
|\| | | | | | | | | | | | | | | | | | | Conflicts: Makefile cmd-list-commands.c cmd-suspend-client.c job.c tmux.h xmalloc.c
| * Add xreallocarray and remove nmemb argument from xrealloc.nicm2014-10-08
| |
| * Use xrealloc(NULL, n, m) instead of xmalloc(n * m) to get overflownicm2014-10-08
| | | | | | | | check.
* | Merge branch 'obsd-master'Thomas Adam2014-09-25
|\|
| * Various minor style and spacing nits.nicm2014-09-01
| |
| * Don't allow pasting into input-disabled panes, from Anish R Athalye.nicm2014-08-25
| |
* | Merge branch 'obsd-master'Thomas Adam2014-08-09
|\| | | | | | | | | Conflicts: client.c
| * Comment style nits.nicm2014-06-20
| |
* | Merge branch 'obsd-master'Thomas Adam2014-06-20
|\|
| * Don't allow multiple buffers with the same name, from Thomas Adam.nicm2014-05-13
| |
* | Merge branch 'obsd-master'Thomas Adam2014-05-13
|\| | | | | | | | | | | Conflicts: format.c window.c
| * Add support for named buffers. If you don't name a buffer, things worknicm2014-05-13
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'obsd-master'Thomas Adam2014-04-24
|\|
| * There is no longer a need for a paste_stack struct or for global_buffersnicm2014-04-24
| | | | | | | | to be global. Move to paste.c.
* | Merge branch 'obsd-master'Thomas Adam2014-04-05
|\| | | | | | | | | | | Conflicts: Makefile tty-keys.c
| * Support UTF-8 with choose-buffer, from Kosuke ASAMI. Also makenicm2014-04-02
| | | | | | | | buffer_sample bigger to let it trim at window right edge.
| * Add setb -a to append and a copy mode append command, from J Raynor withnicm2014-03-31
| | | | | | | | minor changes.
* | Add setb -a to append and a copy mode append command, from J Raynor with minorNicholas Marriott2014-03-06
| | | | | | | | changes.
* | Merge branch 'obsd-master'Thomas Adam2014-02-19
|\|
| * Fix memory leaks with paste_replace, based on changes from J Raynor.nicm2014-02-17
| |
* | Merge branch 'obsd-master'Thomas Adam2012-11-27
|\| | | | | | | Sync from OpenBSD.