The branch, master has been updated
       via  ea5a223a2e8901fa9afa991d147751d8a6789443 (commit)
       via  5b2c8156d528f284c63bc0a698805e4461431257 (commit)
       via  40cb4cb086210916bf5b6140d6f78049073863e6 (commit)
      from  afb4dbd4655a1f0c988d8c65723172144ab79cce (commit)

- Log -----------------------------------------------------------------
commit ea5a223a2e8901fa9afa991d147751d8a6789443
Merge: afb4dbd 5b2c815
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>

    Merge branch 'obsd-master'

 client.c |    1 +
 tty.c    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)



commit 5b2c8156d528f284c63bc0a698805e4461431257
Author: nicm <nicm>
Commit: nicm <nicm>

    fcntl.h is still needed here.
---
 client.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/client.c b/client.c
index 70c1a00..ec63fc0 100644
--- a/client.c
+++ b/client.c
@@ -25,6 +25,7 @@
 
 #include <errno.h>
 #include <event.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>


commit 40cb4cb086210916bf5b6140d6f78049073863e6
Author: jsg <jsg>
Commit: jsg <jsg>

    specifying ECHOCTL once is enough
    ok nicm@
---
 tty.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tty.c b/tty.c
index c8b6a84..3ae21ab 100644
--- a/tty.c
+++ b/tty.c
@@ -193,7 +193,7 @@ tty_init_termios(int fd, struct termios *orig_tio, struct 
bufferevent *bufev)
        tio.c_iflag |= IGNBRK;
        tio.c_oflag &= ~(OPOST|ONLCR|OCRNL|ONLRET);
        tio.c_lflag &= ~(IEXTEN|ICANON|ECHO|ECHOE|ECHONL|ECHOCTL|
-           ECHOPRT|ECHOKE|ECHOCTL|ISIG);
+           ECHOPRT|ECHOKE|ISIG);
        tio.c_cc[VMIN] = 1;
        tio.c_cc[VTIME] = 0;
        if (tcsetattr(fd, TCSANOW, &tio) == 0)


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

Summary of changes:
 client.c |    1 +
 tty.c    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.  Get 
unparalleled scalability from the best Selenium testing platform available.
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to