The branch, master has been updated
via 9e879b4aabc925fc1fbf02e25c331317a3881d17 (commit)
via 99934bf9988ca364d3d75bb185863eed184a2971 (commit)
from 8840f2d629639fe77f4a51eb02c0fa119398f819 (commit)
- Log -----------------------------------------------------------------
commit 9e879b4aabc925fc1fbf02e25c331317a3881d17
Merge: 99934bf 8840f2d
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
tmux.1 | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit 99934bf9988ca364d3d75bb185863eed184a2971
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Write escaped output in control mode rather than hex, from George Nachman.
---
control-notify.c | 8 ++++++--
tmux.1 | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/control-notify.c b/control-notify.c
index 90ee4ff..42c1695 100644
--- a/control-notify.c
+++ b/control-notify.c
@@ -46,8 +46,12 @@ control_notify_input(struct client *c, struct window_pane
*wp,
if (winlink_find_by_window(&c->session->windows, wp->window) != NULL) {
message = evbuffer_new();
evbuffer_add_printf(message, "%%output %u ", wp->id);
- for (i = 0; i < len; i++)
- evbuffer_add_printf(message, "%02hhx", buf[i]);
+ for (i = 0; i < len; i++) {
+ if (buf[i] < ' ' || buf[i] == '\\')
+ evbuffer_add_printf(message, "\\%03o", buf[i]);
+ else
+ evbuffer_add_printf(message, "%c", buf[i]);
+ }
control_write_buffer(c, message);
evbuffer_free(message);
}
diff --git a/tmux.1 b/tmux.1
index 519bf6f..a669fe9 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3672,7 +3672,7 @@ The new layout is
.It Ic %output Ar pane-id Ar value
A window pane produced output.
.Ar value
-contains that output with each byte encoded as two hex digits.
+escapes non-printable characters and backslash as octal \\xxx.
.It Ic %session-changed Ar session-id Ar name
The client is now attached to the session with ID
.Ar session-id ,
-----------------------------------------------------------------------
Summary of changes:
control-notify.c | 8 ++++++--
tmux.1 | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
