The branch, master has been updated
via 2ca8b7f3593ec5a88c9f56a43f5076800957a0db (commit)
via 3a09e01a8e0e64f02ec054ca098da0bd8bbdf5dd (commit)
via d31315884c422fd68c263f692ec2fa2c9409776f (commit)
from 57ca4289759a438829aa79149f152ec46533e258 (commit)
- Log -----------------------------------------------------------------
commit 2ca8b7f3593ec5a88c9f56a43f5076800957a0db
Merge: 57ca428 3a09e01
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Merge branch 'obsd-master'
cmd-choose-client.c | 1 -
cmd-choose-tree.c | 2 +-
input.c | 5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
commit 3a09e01a8e0e64f02ec054ca098da0bd8bbdf5dd
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Do not allow cursor colours to be set beginning with ? as that will
report the colour, from Hayaki Saito.
---
cmd-choose-client.c | 1 -
input.c | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd-choose-client.c b/cmd-choose-client.c
index 299fa3a..1f9741f 100644
--- a/cmd-choose-client.c
+++ b/cmd-choose-client.c
@@ -44,7 +44,6 @@ const struct cmd_entry cmd_choose_client_entry = {
struct cmd_choose_client_data {
struct client *client;
- char *template;
};
enum cmd_retval
diff --git a/input.c b/input.c
index 7d26a66..e04ddc4 100644
--- a/input.c
+++ b/input.c
@@ -1565,10 +1565,11 @@ input_exit_osc(struct input_ctx *ictx)
server_status_window(ictx->wp->window);
break;
case 12:
- screen_set_cursor_colour(ictx->ctx.s, p);
+ if (*p != '?') /* ? is colour request */
+ screen_set_cursor_colour(ictx->ctx.s, p);
break;
case 112:
- if (*p == '\0') /* No arguments allowed. */
+ if (*p == '\0') /* no arguments allowed */
screen_set_cursor_colour(ictx->ctx.s, "");
break;
default:
commit d31315884c422fd68c263f692ec2fa2c9409776f
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Fix some blank line nits.
---
cmd-choose-tree.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 24c4299..b274d56 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -219,6 +219,7 @@ windows_only:
free(final_win_action);
}
+
/*
* If we're just drawing windows, don't consider moving on to
* other sessions as we only list windows in this session.
@@ -260,5 +261,4 @@ cmd_choose_tree_free(struct window_choose_data *cdata)
free(cdata->command);
format_free(cdata->ft);
free(cdata);
-
}
-----------------------------------------------------------------------
Summary of changes:
cmd-choose-client.c | 1 -
cmd-choose-tree.c | 2 +-
input.c | 5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
