Thomas Adam 253f1395a0 Don't rely on "-s ours" for merging ...

The ours strategy assumes one subsumes the other -- which isn't the case for
the portable version, so for now -- just go back to using the default merge
strategy of recursive, and fix-up any conflicts manually.

2012-09-24 18:05:34 +01:00

compat

Sync with OpenBSD. Mostly because of the added _SAFE macros which is

2012-07-12 20:59:39 +00:00

examples

Sync with reality.

2012-07-16 22:19:13 +00:00

tools

Expand the Id keyword.

2011-07-09 09:42:33 +00:00

www

Change WWW links to Git not Subverson.

2012-09-04 08:00:34 +01:00

.gitignore

.gitignore + Makefile Makefile.in configure

2012-09-04 09:26:54 +01:00

arguments.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

array.h

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

attributes.c

Sync OpenBSD patchset 1067:

2012-03-18 02:17:20 +00:00

autogen.sh

Make autogen.sh executable

2012-09-04 08:19:12 +01:00

cfg.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

CHANGES

Major changes since the previous version.

2012-01-23 12:41:36 +00:00

client.c

If stdin in the client is enable immediately, tmux will eat anything

2012-09-04 22:35:52 +01:00

clock.c

Expand the Id keyword.

2011-07-09 09:42:33 +00:00

cmd-attach-session.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-bind-key.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-break-pane.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-capture-pane.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-choose-buffer.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-choose-client.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-choose-list.c

Handle empty list properly in choose-list, based on fix from Thomas Adam.

2012-09-05 10:14:21 +00:00

cmd-choose-tree.c

Use ACS characters for choose-tree arrows based on diff from Romain

2012-09-24 17:53:10 +01:00

cmd-clear-history.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-clock-mode.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-command-prompt.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-confirm-before.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-copy-mode.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-delete-buffer.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-detach-client.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-display-message.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-display-panes.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-find-window.c

When choosing a pane found by find-window, switch to that pane rather

2012-09-04 22:37:31 +01:00

cmd-has-session.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-if-shell.c

Sync OpenBSD patchset 1159:

2012-08-12 19:30:54 +00:00

cmd-join-pane.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-kill-pane.c

Add a patch missed during a merge sometime to use

2012-08-14 08:15:00 +00:00

cmd-kill-server.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-kill-session.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-kill-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-link-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-list-buffers.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-list-clients.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-list-commands.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-list-keys.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-list-panes.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-list-sessions.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-list-windows.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-list.c

Sync OpenBSD patchset 1153:

2012-08-12 19:23:01 +00:00

cmd-load-buffer.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-lock-server.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-move-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-new-session.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-new-window.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-paste-buffer.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-pipe-pane.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-refresh-client.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-rename-session.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-rename-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-resize-pane.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-respawn-pane.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-respawn-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-rotate-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-run-shell.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-save-buffer.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-select-layout.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-select-pane.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-select-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-send-keys.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-send-prefix.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-server-info.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-set-buffer.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-set-environment.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-set-option.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-show-buffer.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-show-environment.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-show-messages.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-show-options.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-source-file.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-split-window.c

Sync OpenBSD patchset 1162:

2012-08-31 09:18:50 +00:00

cmd-start-server.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-string.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

cmd-suspend-client.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-swap-pane.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-swap-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-switch-client.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-unbind-key.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd-unlink-window.c

Sync OpenBSD patchset 1151:

2012-07-11 19:37:32 +00:00

cmd.c

Use pgrp of pty fd not pid of immediate child when recovering current

2012-09-24 13:05:10 +00:00

colour.c

Sync OpenBSD patchset 1006:

2012-01-21 19:33:45 +00:00

compat.h

Typo.

2011-07-22 15:10:24 +00:00

configure.ac

Create a debug build by default.

2012-01-23 13:20:14 +00:00

control-notify.c

Send notifications to control clients. Also don't redraw client when

2012-09-04 22:36:47 +01:00

control.c

Merge branch 'obsd-master'

2012-09-24 17:55:06 +01:00

environ.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

FAQ

+ entry to show default options, suggested by Thomas Adam.

2012-07-08 13:32:09 +00:00

format.c

Use pgrp of pty fd not pid of immediate child when recovering current

2012-09-24 13:05:10 +00:00

grid-utf8.c

Expand the Id keyword.

2011-07-09 09:42:33 +00:00

grid-view.c

Sync OpenBSD patchset 1016:

2012-01-31 11:58:55 +00:00

grid.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

input-keys.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

input.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

job.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

key-bindings.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

key-string.c

Sync OpenBSD patchset 1040:

2012-03-07 13:38:26 +00:00

layout-custom.c

Sync OpenBSD patchset 1069:

2012-03-18 02:22:09 +00:00

layout-set.c

Sync OpenBSD patchset 978:

2011-11-10 21:41:37 +00:00

layout.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

log.c

Do not use stderr for log file and don't call log_close when not needed.

2012-05-30 15:01:57 +00:00

Makefile.am

Fixup Makefile.am

2012-09-04 22:50:16 +01:00

mode-key.c

Sync OpenBSD patchset 1167:

2012-08-31 09:24:51 +00:00

names.c

Sync OpenBSD patchset 1165:

2012-08-31 09:22:08 +00:00

NOTES

Remove an extraneous word.

2012-05-23 20:08:14 +00:00

notify.c

Send notifications to control clients. Also don't redraw client when

2012-09-04 22:36:47 +01:00

options-table.c

Sync OpenBSD patchset 1104:

2012-05-03 17:51:04 +00:00

options.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

osdep-aix.c

Change the way the working directory for new processes is discovered. If

2011-12-09 16:37:29 +00:00

osdep-darwin.c

Fill in osdep_get_cwd on Darwin, from Alex Ernst.

2012-01-27 09:01:06 +00:00

osdep-dragonfly.c

Change the way the working directory for new processes is discovered. If

2011-12-09 16:37:29 +00:00

osdep-freebsd.c

Change the way the working directory for new processes is discovered. If

2011-12-09 16:37:29 +00:00

osdep-hpux.c

Change the way the working directory for new processes is discovered. If

2011-12-09 16:37:29 +00:00

osdep-linux.c

Remove remaining xfree calls from the portable version.

2012-07-11 19:50:46 +00:00

osdep-netbsd.c

Change the way the working directory for new processes is discovered. If

2011-12-09 16:37:29 +00:00

osdep-openbsd.c

Merge branch 'obsd-master'

2012-09-24 17:55:06 +01:00

osdep-sunos.c

Remove remaining xfree calls from the portable version.

2012-07-11 19:50:46 +00:00

osdep-unknown.c

Change the way the working directory for new processes is discovered. If

2011-12-09 16:37:29 +00:00

paste.c

Trivial code simplification from Tim Ruehsen.

2012-09-04 22:37:31 +01:00

resize.c

Sync OpenBSD patchset 1069:

2012-03-18 02:22:09 +00:00

screen-redraw.c

Sync OpenBSD patchset 1122:

2012-05-30 13:41:58 +00:00

screen-write.c

Use ACS characters for choose-tree arrows based on diff from Romain

2012-09-24 17:53:10 +01:00

screen.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

server-client.c

Send notifications to control clients. Also don't redraw client when

2012-09-04 22:36:47 +01:00

server-fn.c

If stdin in the client is enable immediately, tmux will eat anything

2012-09-04 22:35:52 +01:00

server-window.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

server.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

session.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

signal.c

Expand the Id keyword.

2011-07-09 09:42:33 +00:00

status.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

SYNCING

Don't rely on "-s ours" for merging

2012-09-24 18:05:34 +01:00

tmux.1

add cmd-choose-list to allow arbitrary options to be selected. From

2012-09-04 22:37:29 +01:00

tmux.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

tmux.h

Merge branch 'obsd-master'

2012-09-24 17:55:06 +01:00

TODO

+.

2012-08-14 09:38:34 +00:00

tty-acs.c

Expand the Id keyword.

2011-07-09 09:42:33 +00:00

tty-keys.c

Can't call evtimer_pending on uninitialized events, call

2012-09-04 22:35:52 +01:00

tty-term.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

tty.c

Merge branch 'obsd-master'

2012-09-15 12:23:25 +01:00

utf8.c

Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.

2012-09-24 17:53:15 +01:00

window-choose.c

add cmd-choose-list to allow arbitrary options to be selected. From

2012-09-04 22:37:29 +01:00

window-clock.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

window-copy.c

Sync OpenBSD patchset 1156:

2012-08-12 19:28:20 +00:00

window.c

Sync OpenBSD patchset 1165:

2012-08-31 09:22:08 +00:00

xmalloc.c

Sync OpenBSD patchset 1150:

2012-07-11 19:34:16 +00:00

xterm-keys.c

Sync OpenBSD patchset 925:

2011-07-03 21:50:27 +00:00

Description

tmux source code

88 MiB

Languages

C 84.5%

Roff 6.9%

Shell 6.2%

Yacc 1.2%

M4 0.7%

Other 0.5%