Nicholas Marriott | 21 Oct 13:36 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-185-g201036a

The branch, master has been updated
       via  201036ad80f2e51f7238db2adf05914a4a4f5819 (commit)
       via  65257b8e9b55d8d180265d714ba9b3637643c6dc (commit)
      from  696b5a628f0f31f4c3566b5c0ab51fbd9f9f9880 (commit)

- Log -----------------------------------------------------------------
commit 201036ad80f2e51f7238db2adf05914a4a4f5819
Merge: 65257b8 696b5a6
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

 Makefile.am            |    3 -
 arguments.c            |    1 +
 array.h                |    4 +-
 client.c               |   13 ++--
 cmd-attach-session.c   |    1 -
 cmd-bind-key.c         |    1 -
 cmd-break-pane.c       |    3 +-
 cmd-capture-pane.c     |    3 +-
 cmd-choose-buffer.c    |    4 +-
 cmd-choose-client.c    |    7 ++-
 cmd-choose-tree.c      |   12 +++-
 cmd-clear-history.c    |    1 -
 cmd-clock-mode.c       |    1 -
 cmd-command-prompt.c   |   30 --------
 cmd-confirm-before.c   |   22 +-----
 cmd-copy-mode.c        |   10 ---
 cmd-delete-buffer.c    |    1 -
(Continue reading)

Thomas Adam | 21 Oct 08:12 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-183-g696b5a6

The branch, master has been updated
       via  696b5a628f0f31f4c3566b5c0ab51fbd9f9f9880 (commit)
       via  562af864bd8ab06c416075b5742ce3bbcf6d0610 (commit)
       via  0a1a88d63caf3a0e8b4440686e73e1f0f690e03c (commit)
       via  4c42381410891c43b1326e95f150dfcf637b1e69 (commit)
       via  900f6fc17e6764377a8e293ce742fb41f1add9bd (commit)
       via  30bacf6f3038a867b53143150944f0997558114b (commit)
       via  8a5ceac3a9a21ec70c480d284dc1fc6907af2ce0 (commit)
       via  f5bc85591a1f7c26bf030f5781d63985b2ee4d23 (commit)
       via  7afe417a60a3b80ba16cd758b62e3f500350fb3e (commit)
       via  45dfc5a074e2ceae11a6d4aeae597bee1e028503 (commit)
       via  f0b69c771173583eee8f1457c080746ea6144c5f (commit)
      from  e44bdcce4c661b52d07f30962aafa800d9ca5e28 (commit)

- Log -----------------------------------------------------------------
commit 696b5a628f0f31f4c3566b5c0ab51fbd9f9f9880
Merge: 562af86 e44bdcc
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



commit 562af864bd8ab06c416075b5742ce3bbcf6d0610
Merge: b6aef24 0a1a88d
Author: Thomas Adam <thomas <at> xteddy.org>
Commit: Thomas Adam <thomas <at> xteddy.org>

    Merge branch 'obsd-master'
(Continue reading)

Thomas Adam | 16 Oct 17:53 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-172-ge44bdcc

The branch, master has been updated
       via  e44bdcce4c661b52d07f30962aafa800d9ca5e28 (commit)
       via  2e8f6805eb911e3de82fc43e3c90c8d425df04a8 (commit)
       via  a77355b6bf9a0beb2e9d0a8b9613266984bb598d (commit)
       via  a27ba6e38006c12c48de88600b8cff9f6aabfed7 (commit)
       via  77efcf8bdd14cd19dc445cf6e44bba7af414939c (commit)
       via  6610e89689de1ba8afe492ad20b541271d39732d (commit)
       via  d306bbe11e9701235a468e463699a832b89d6f4d (commit)
       via  c011446e781eae4fd1116dacc63a3e26c2f47788 (commit)
       via  2f19df09b1850d80e60f2d37f0b7f0db22eae6f7 (commit)
       via  045d0c3b9f616fe76b68d4551a6d66f410e760e8 (commit)
       via  a54b0055f66bc2d27bd57fc3f818dc185118470f (commit)
       via  304f86cdbb5bf87f7a266e84c0f4fbd7bf25bb5e (commit)
      from  b6aef2490f086f3404f439308bb1746ec5134e9a (commit)

- Log -----------------------------------------------------------------
commit e44bdcce4c661b52d07f30962aafa800d9ca5e28
Merge: 2e8f680 b6aef24
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

 osdep-sunos.c   |   11 ++++++++++-
 server-client.c |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

commit 2e8f6805eb911e3de82fc43e3c90c8d425df04a8
Author: Thomas Adam <thomas <at> xteddy.org>
Commit: Thomas Adam <thomas <at> xteddy.org>
(Continue reading)

Nicholas Marriott | 2 Oct 10:47 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-160-gb6aef24

The branch, master has been updated
       via  b6aef2490f086f3404f439308bb1746ec5134e9a (commit)
      from  931c17ed4f3ac18470f5b385210d61b24a57b5d4 (commit)

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

    Ignore ENXIO on Solaris as well, from Peter Schow.
---
 server-client.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server-client.c b/server-client.c
index 08085f7..d1e3e82 100644
--- a/server-client.c
+++ b/server-client.c
 <at>  <at>  -549,7 +549,7  <at>  <at>  server_client_check_resize(struct window_pane *wp)
 		 * other platforms and ignoring it doesn't seem to cause any
 		 * issues.
 		 */
-		if (errno != EINVAL)
+		if (errno != EINVAL && errno != ENXIO)
 #endif
 		fatal("ioctl failed");
 	}

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

(Continue reading)

Nicholas Marriott | 2 Oct 10:30 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-159-g931c17e

The branch, master has been updated
       via  931c17ed4f3ac18470f5b385210d61b24a57b5d4 (commit)
       via  24d9dc518de6761f645165d49f321b2b56904fb5 (commit)
      from  2874a431c050527244a56e7f241baf053c722f88 (commit)

- Log -----------------------------------------------------------------
commit 931c17ed4f3ac18470f5b385210d61b24a57b5d4
Merge: 24d9dc5 2874a43
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-list.c         |    2 +-
 cmd-load-buffer.c  |    2 +-
 cmd-new-window.c   |    2 +-
 cmd-queue.c        |    6 +++---
 cmd-select-pane.c  |   34 +++++++++++++++++++++++-----------
 cmd-set-option.c   |    4 ++--
 cmd-split-window.c |    2 +-
 cmd-wait-for.c     |   26 ++++++++++++++++++++++++--
 format.c           |    5 ++++-
 grid.c             |   12 +++++-------
 mode-key.c         |    1 +
 paste.c            |    7 +++++--
 screen.c           |   23 ++++++++++++++++++-----
 server-client.c    |    2 +-
 server.c           |   18 +++++++++++++++++-
 tmux.1             |   21 +++++++++++++++++----
(Continue reading)

Thomas Adam | 25 Sep 12:30 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-157-g2874a43

The branch, master has been updated
       via  2874a431c050527244a56e7f241baf053c722f88 (commit)
       via  21062d74d5373699aad9fe8d77bd5312a33e9834 (commit)
       via  9bda7e881a01af4deabeccc7a292d873c9c7f4e6 (commit)
       via  8a473b57576a7deab9f498db1399b0d798fb45b2 (commit)
       via  733cea8847fadf922e239f05b4cdd8afc2f6c943 (commit)
       via  4e956d545a52fe6b8310cfb30a26a89976d55cd9 (commit)
       via  e07519804957d5c41aa70e7f1132e29fe5f84862 (commit)
       via  2b79d366528294b80960f3a7ed0923bfa0bdc89c (commit)
       via  29d20a55b645600feca1b54a13333e598336dad2 (commit)
       via  f518a077b176e65a30a187af21b00b0b9031dad7 (commit)
      from  5e7f1b9f0a5bcff8f9ba410c17de4e822428614c (commit)

- Log -----------------------------------------------------------------
commit 2874a431c050527244a56e7f241baf053c722f88
Merge: 5e7f1b9 21062d7
Author: Thomas Adam <thomas <at> xteddy.org>
Commit: Thomas Adam <thomas <at> xteddy.org>

    Merge branch 'obsd-master'

 client.c           |    4 ++--
 cmd-list.c         |    2 +-
 cmd-load-buffer.c  |    2 +-
 cmd-new-window.c   |    2 +-
 cmd-queue.c        |    6 +++---
 cmd-select-pane.c  |   34 +++++++++++++++++++++++-----------
 cmd-set-option.c   |    4 ++--
 cmd-split-window.c |    2 +-
 cmd-wait-for.c     |   26 ++++++++++++++++++++++++--
(Continue reading)

Nicholas Marriott | 25 Sep 11:54 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-147-g5e7f1b9

The branch, master has been updated
       via  5e7f1b9f0a5bcff8f9ba410c17de4e822428614c (commit)
      from  16670410ca24e43eff88824aacb988432afc8691 (commit)

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

    Don't close random file descriptor on error, from J Raynor.
---
 compat/forkpty-hpux.c  |    2 +-
 compat/forkpty-sunos.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat/forkpty-hpux.c b/compat/forkpty-hpux.c
index 90452f8..c72e096 100644
--- a/compat/forkpty-hpux.c
+++ b/compat/forkpty-hpux.c
 <at>  <at>  -29,7 +29,7  <at>  <at> 
 pid_t
 forkpty(int *master, char *name, struct termios *tio, struct winsize *ws)
 {
-	int	slave;
+	int	slave = -1;
 	char   *path;
 	pid_t	pid;

diff --git a/compat/forkpty-sunos.c b/compat/forkpty-sunos.c
index 7b254d8..0015bf4 100644
(Continue reading)

Nicholas Marriott | 23 Sep 11:50 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-146-g1667041

The branch, master has been updated
       via  16670410ca24e43eff88824aacb988432afc8691 (commit)
       via  054a825ee24e2a2ea294ea2a259af7eeb8ae947e (commit)
       via  b2224947fa697c397b5d3617b6b17e96c4302e6c (commit)
      from  4d53fd98a67b20527718013ef52f263bf878481c (commit)

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

    I broke last change, fix so it works, from J Raynor.
---
 compat/forkpty-aix.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compat/forkpty-aix.c b/compat/forkpty-aix.c
index 78e5f7e..7638c52 100644
--- a/compat/forkpty-aix.c
+++ b/compat/forkpty-aix.c
 <at>  <at>  -30,7 +30,7  <at>  <at> 
 pid_t
 forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
 {
-	int	slave, fd, pipe_fd[2];
+	int	slave = -1, fd, pipe_fd[2];
 	char   *path, dummy;
 	pid_t	pid;

 <at>  <at>  -38,7 +38,7  <at>  <at>  forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
(Continue reading)

Nicholas Marriott | 22 Sep 20:29 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-143-g4d53fd9

The branch, master has been updated
       via  4d53fd98a67b20527718013ef52f263bf878481c (commit)
      from  938d91d2c37f8837e5e808c9315f551ac7bc4636 (commit)

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

    Synchronize forkpty master and child to avoid hang on AIX with fast exiting
    child and output left in the queue, from J Raynor.
---
 compat/forkpty-aix.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/compat/forkpty-aix.c b/compat/forkpty-aix.c
index db9c2e7..78e5f7e 100644
--- a/compat/forkpty-aix.c
+++ b/compat/forkpty-aix.c
 <at>  <at>  -23,16 +23,20  <at>  <at> 
 #include <stdlib.h>
 #include <stropts.h>
 #include <unistd.h>
+#include <errno.h>

 #include "tmux.h"

 pid_t
 forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
 {
(Continue reading)

Nicholas Marriott | 16 Sep 05:34 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-142-g938d91d

The branch, master has been updated
       via  938d91d2c37f8837e5e808c9315f551ac7bc4636 (commit)
      from  93fe1b8659bb74a2931b857d8ba1231e151b770c (commit)

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

    Tweak www and add RELEASE variable for current release version so we don't need
    to turn it back and forth when updating.
---
 Makefile.am       |    2 +-
 configure.ac      |    2 ++
 www/index.html.in |   11 +++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9fcb45f..04107ab 100644
--- a/Makefile.am
+++ b/Makefile.am
 <at>  <at>  -267,4 +267,4  <at>  <at>  update-index.html:
 			convert "$$i" -resize 200x150 "small-$$i"; \
 		done \
 	)
-	sed "s/%%VERSION%%/${VERSION}/g" www/index.html.in >www/index.html
+	sed "s/%%RELEASE%%/${RELEASE}/g" www/index.html.in >www/index.html
diff --git a/configure.ac b/configure.ac
index 17cd0da..b524ff8 100644
--- a/configure.ac
(Continue reading)

Nicholas Marriott | 9 Sep 00:34 2014
Picon
Picon

[SCM] tmux branch master updated. 1.9a-141-g93fe1b8

The branch, master has been updated
       via  93fe1b8659bb74a2931b857d8ba1231e151b770c (commit)
      from  72797074f3bfe84914b25d6e1a5c9fc99e90e721 (commit)

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

    Stupid comment.
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 82533a3..17cd0da 100644
--- a/configure.ac
+++ b/configure.ac
 <at>  <at>  -528,5 +528,5  <at>  <at>  AM_CONDITIONAL(IS_SUNOS, test "x$PLATFORM" = xsunos)
 AM_CONDITIONAL(IS_HPUX, test "x$PLATFORM" = xhpux)
 AM_CONDITIONAL(IS_UNKNOWN, test "x$PLATFORM" = xunknown)

-# autoconf should create a Makefile. A shock!
+# autoconf should create a Makefile.
 AC_OUTPUT(Makefile)

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

Summary of changes:
 configure.ac |    2 +-
(Continue reading)


Gmane