Nicholas Marriott | 15 May 2013 17:50
Picon

[SCM] tmux branch master updated. 1.8-44-g907ad00

The branch, master has been updated
       via  907ad00300506c25ee84223811e25a411dc21517 (commit)
       via  5b1cf02f2ea224922661495af32d46b024e28eef (commit)
      from  fce095665c62eb38826f42ae55a0fbe998f18be0 (commit)

- Log -----------------------------------------------------------------
commit 907ad00300506c25ee84223811e25a411dc21517
Merge: 5b1cf02 fce0956
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

    Conflicts:
    	Makefile.am

 Makefile.am       |   11 +++++++----
 client.c          |    4 ++--
 cmd-choose-tree.c |   10 +++++-----
 configure.ac      |    3 +++
 format.c          |    6 +++---
 job.c             |    4 ++--
 server-client.c   |    8 +++++---
 server-fn.c       |    1 +
 server.c          |    8 ++++----
 tmux.1            |    6 +++---
 tmux.c            |    2 +-
 tmux.h            |    6 ++----
 window-choose.c   |   14 +++++++++++---
 13 files changed, 49 insertions(+), 34 deletions(-)
(Continue reading)

Nicholas Marriott | 28 Apr 2013 16:37
Picon

[SCM] tmux branch master updated. 1.8-42-gfce0956

The branch, master has been updated
       via  fce095665c62eb38826f42ae55a0fbe998f18be0 (commit)
      from  ce52e45d44b38fcedfe27bce519ce6f4fc76a25d (commit)

- Log -----------------------------------------------------------------
commit fce095665c62eb38826f42ae55a0fbe998f18be0
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Use $(srcdir) for generating tmux.1, reported by fasta_ on IRC.
---
 Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 726582a..3eb3190 100644
--- a/Makefile.am
+++ b/Makefile.am
 <at>  <at>  -240,10 +240,11  <at>  <at>  endif
 # Build tmux.1 in the right format.
 tmux.1: tmux.1.in
 	if test x <at> MANFORMAT <at>  = xmdoc; then \
-		sed -e "s| <at> SYSCONFDIR <at> |$(sysconfdir)|g" tmux.1.in >tmux.1; \
+		sed -e "s| <at> SYSCONFDIR <at> |$(sysconfdir)|g" $(srcdir)/tmux.1.in \
+		>$(srcdir)/tmux.1; \
 	else \
-		sed -e "s| <at> SYSCONFDIR <at> |$(sysconfdir)|g" tmux.1.in| \
-		$(AWK) -fmdoc2man.awk >tmux.1; \
+		sed -e "s| <at> SYSCONFDIR <at> |$(sysconfdir)|g" $(srcdir)/tmux.1.in| \
+		$(AWK) -fmdoc2man.awk >$(srcdir)/tmux.1; \
(Continue reading)

Nicholas Marriott | 24 Apr 2013 12:00
Picon

[SCM] tmux branch master updated. 1.8-41-gce52e45

The branch, master has been updated
       via  ce52e45d44b38fcedfe27bce519ce6f4fc76a25d (commit)
       via  4f3c31a6b63f4489bfc672b510036fd8d9491595 (commit)
      from  70bc8ef8450bfd2ae90df86f4c02437a4bb83319 (commit)

- Log -----------------------------------------------------------------
commit ce52e45d44b38fcedfe27bce519ce6f4fc76a25d
Merge: 4f3c31a 70bc8ef
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

 client.c          |    4 ++--
 cmd-choose-tree.c |   10 +++++-----
 format.c          |    6 +++---
 job.c             |    4 ++--
 server-client.c   |    8 +++++---
 server-fn.c       |    1 +
 tmux.h            |    2 ++
 window-choose.c   |   14 +++++++++++---
 8 files changed, 31 insertions(+), 18 deletions(-)

commit 4f3c31a6b63f4489bfc672b510036fd8d9491595
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Use sysconfdir for the location of global tmux.conf (but default it to /etc),
    based on changes from Dagobert Michelsen.
---
(Continue reading)

Thomas Adam | 23 Apr 2013 09:28
Picon

[SCM] tmux branch master updated. 1.8-39-g70bc8ef

The branch, master has been updated
       via  70bc8ef8450bfd2ae90df86f4c02437a4bb83319 (commit)
       via  cd60e57b6ac682a56fd66d70af4c5922315b5a9a (commit)
       via  3d2b7d5bce9532cedd647ace319afbf95ebe0e20 (commit)
       via  04f54ab38f9a5f32e6fb89b57380cc7150c08006 (commit)
       via  46c7dbef0f7803dad39db355ee866ecab8db696c (commit)
       via  d89b35e6826ecaccc4d2f421c8013f35ec5854a0 (commit)
       via  5dda1abc32b7b1eb59901a5592569e21d88c6ad2 (commit)
       via  55640a31b3fbe5fd9b3eb4537779e2ffac58f47d (commit)
       via  88428cff3a0ef2e2013e990679dc746c58a99d12 (commit)
      from  11b90bc9591b4b101efef1f8a9a0d9656d2953c9 (commit)

- Log -----------------------------------------------------------------
commit 70bc8ef8450bfd2ae90df86f4c02437a4bb83319
Merge: cd60e57 11b90bc
Author: Thomas Adam <thomas <at> xteddy.org>
Commit: Thomas Adam <thomas <at> xteddy.org>

    Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

 Makefile.am        |    5 ++++-
 compat.h           |    5 +++++
 compat/cfmakeraw.c |   32 ++++++++++++++++++++++++++++++++
 configure.ac       |    8 ++++++++
 tmux.c             |    1 -
 5 files changed, 49 insertions(+), 2 deletions(-)

commit cd60e57b6ac682a56fd66d70af4c5922315b5a9a
Merge: c24b58e 3d2b7d5
Author: Thomas Adam <thomas <at> xteddy.org>
(Continue reading)

Nicholas Marriott | 22 Apr 2013 15:05
Picon

[SCM] tmux branch master updated. 1.8-30-g11b90bc

The branch, master has been updated
       via  11b90bc9591b4b101efef1f8a9a0d9656d2953c9 (commit)
      from  792e2856c9774cca262929f81b9adbbac0fa1d13 (commit)

- Log -----------------------------------------------------------------
commit 11b90bc9591b4b101efef1f8a9a0d9656d2953c9
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Pass tmux.1.in to awk on stdin rather than as an argument.
---
 Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c5369fd..c131940 100644
--- a/Makefile.am
+++ b/Makefile.am
 <at>  <at>  -242,7 +242,7  <at>  <at>  tmux.1: tmux.1.in
 	if test x <at> MANFORMAT <at>  = xmdoc; then \
 		cp tmux.1.in tmux.1; \
 	else \
-		$(AWK) -fmdoc2man.awk tmux.1.in >tmux.1; \
+		$(AWK) -fmdoc2man.awk <tmux.1.in >tmux.1; \
 	fi

 # Update SF web site.

-----------------------------------------------------------------------

(Continue reading)

Nicholas Marriott | 22 Apr 2013 10:46
Picon

[SCM] tmux branch master updated. 1.8-29-g792e285

The branch, master has been updated
       via  792e2856c9774cca262929f81b9adbbac0fa1d13 (commit)
       via  a46ccbd883495d2acb3eab89e5bcdb61c0c7e195 (commit)
      from  c24b58e2ee8691870736959deb252c225b205b4d (commit)

- Log -----------------------------------------------------------------
commit 792e2856c9774cca262929f81b9adbbac0fa1d13
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Add compat for cfmakeraw, from Dagobert Michelsen.
---
 Makefile.am        |    3 +++
 compat.h           |    5 +++++
 compat/cfmakeraw.c |   32 ++++++++++++++++++++++++++++++++
 configure.ac       |    8 ++++++++
 4 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b85eae0..c5369fd 100644
--- a/Makefile.am
+++ b/Makefile.am
 <at>  <at>  -233,6 +233,9  <at>  <at>  endif
 if NO_B64_NTOP
 nodist_tmux_SOURCES += compat/b64_ntop.c
 endif
+if NO_CFMAKERAW
+nodist_tmux_SOURCES += compat/cfmakeraw.c
+endif

(Continue reading)

Nicholas Marriott | 16 Apr 2013 14:18
Picon

[SCM] tmux branch master updated. 1.8-27-gc24b58e

The branch, master has been updated
       via  c24b58e2ee8691870736959deb252c225b205b4d (commit)
       via  9e537c808b95e01165f1c2831b3737b93c0110c3 (commit)
       via  4ccb2e2c218a10a8039ca801231aaf09b6bf3bce (commit)
      from  2c4543b9e9bd38bcc45393dad94930bcde872e6c (commit)

- Log -----------------------------------------------------------------
commit c24b58e2ee8691870736959deb252c225b205b4d
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Generate tmux.1 using mdoc2man.awk on Solaris, issue brought up and changes
    tested by Dagobert Michelsen.
---
 .gitignore          |    1 +
 Makefile.am         |   14 ++-
 configure.ac        |    5 +
 mdoc2man.awk        |  370 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tmux.1 => tmux.1.in |    0
 5 files changed, 388 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3906ad..3b40086 100644
--- a/.gitignore
+++ b/.gitignore
 <at>  <at>  -15,3 +15,4  <at>  <at>  tmux
 Makefile
 Makefile.in
 configure
+tmux.1
(Continue reading)

Thomas Adam | 14 Apr 2013 19:07
Picon

[SCM] tmux branch master updated. 1.8-24-g2c4543b

The branch, master has been updated
       via  2c4543b9e9bd38bcc45393dad94930bcde872e6c (commit)
      from  b58bca9a72009101da373a3b7463fd866ecac58c (commit)

- Log -----------------------------------------------------------------
commit 2c4543b9e9bd38bcc45393dad94930bcde872e6c
Author: Thomas Adam <thomas <at> xteddy.org>
Commit: Thomas Adam <thomas <at> xteddy.org>

    Add back missing -V flag

    This went walkies from a previous git commit.
---
 tmux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tmux.c b/tmux.c
index e8fd98b..e6de5cf 100644
--- a/tmux.c
+++ b/tmux.c
 <at>  <at>  -253,7 +253,7  <at>  <at>  main(int argc, char **argv)
 	quiet = flags = 0;
 	label = path = NULL;
 	login_shell = (**argv == '-');
-	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) {
+	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUVv")) != -1) {
 		switch (opt) {
 		case '2':
 			flags |= IDENTIFY_256COLOURS;

(Continue reading)

Thomas Adam | 13 Apr 2013 18:11
Picon

[SCM] tmux branch master updated. 1.8-23-gb58bca9

The branch, master has been updated
       via  b58bca9a72009101da373a3b7463fd866ecac58c (commit)
       via  27dcf470dc4aa5901ac7f01b3a9f971e02f2229e (commit)
       via  caa8290510244990b26106e027aa253237ada629 (commit)
       via  7f9b225cc269211b86a4c4d2168146c217d63118 (commit)
       via  cbee283c26968304b473e2191d2bb5f52208b58d (commit)
       via  9fcda95a6f55f017536cdf24366754a2304c1059 (commit)
       via  7ada64d5f8a0df39229c41b992c0ee8ac9f0a1d7 (commit)
       via  20f0d917beb0f774af2628ed7efe2a33cf59f42a (commit)
       via  69c86379e39476013205fce627951dd733d647b3 (commit)
       via  738e789dbd7712ab94073036cf4e903abc68447f (commit)
       via  66afcf5be092ed0ab86d1d4059426823e72c63d5 (commit)
       via  7f636587098593c6c0efd3feaecb970aa7170116 (commit)
       via  5e4d9a3197a229ecb30d51f5b7e6756ef31dc1d2 (commit)
       via  982354765bc6f0bfb225d7c1f96e5b73f9880533 (commit)
      from  e312db140868754358d40ec17595327a8fbbf180 (commit)

- Log -----------------------------------------------------------------
commit b58bca9a72009101da373a3b7463fd866ecac58c
Merge: e312db1 27dcf47
Author: Thomas Adam <thomas <at> xteddy.org>
Commit: Thomas Adam <thomas <at> xteddy.org>

    Merge branch 'obsd-master'

    Conflicts:
    	tmux.c

 clock.c           |   15 +++++++++++----
 cmd-copy-mode.c   |    8 +++++---
(Continue reading)

Nicholas Marriott | 10 Apr 2013 14:04
Picon

[SCM] tmux branch master updated. 1.8-9-ge312db1

The branch, master has been updated
       via  e312db140868754358d40ec17595327a8fbbf180 (commit)
      from  743bd1275fecb7e33c8bc1cbeeeb065384ca3f9d (commit)

- Log -----------------------------------------------------------------
commit e312db140868754358d40ec17595327a8fbbf180
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Add wait-for to tmux.vim from Ben Boeckel.
---
 examples/tmux.vim |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/examples/tmux.vim b/examples/tmux.vim
index 076115c..e85f8ff 100644
--- a/examples/tmux.vim
+++ b/examples/tmux.vim
 <at>  <at>  -56,7 +56,7  <at>  <at>  syn keyword tmuxCmds
 	\ list-buffers loadb load-buffer pasteb paste-buffer saveb save-buffer
 	\ setb set-buffer showb show-buffer
 	\ clock-mode if[-shell] lock[-server] run[-shell] server-info info
-	\ choose-list
+	\ choose-list wait-for

 syn keyword tmuxOptsSet
 	\ buffer-limit escape-time exit-unattached exit-unattached quiet

-----------------------------------------------------------------------

(Continue reading)

Nicholas Marriott | 10 Apr 2013 13:53
Picon

[SCM] tmux branch master updated. 1.8-8-g743bd12

The branch, master has been updated
       via  743bd1275fecb7e33c8bc1cbeeeb065384ca3f9d (commit)
      from  46b3c1a02564268ab810d0f54190f1e8fc1f4f6d (commit)

- Log -----------------------------------------------------------------
commit 743bd1275fecb7e33c8bc1cbeeeb065384ca3f9d
Author: Nicholas Marriott <nicholas.marriott <at> gmail.com>
Commit: Nicholas Marriott <nicholas.marriott <at> gmail.com>

    Need errno.h, reported by Swaroop M S.
---
 server-client.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/server-client.c b/server-client.c
index 77e6de7..0ab50b5 100644
--- a/server-client.c
+++ b/server-client.c
 <at>  <at>  -19,6 +19,7  <at>  <at> 
 #include <sys/types.h>
 #include <sys/ioctl.h>

+#include <errno.h>
 #include <event.h>
 #include <fcntl.h>
 #include <stdlib.h>

-----------------------------------------------------------------------

Summary of changes:
(Continue reading)


Gmane