aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd-display-message.c11
-rw-r--r--tmux.112
2 files changed, 16 insertions, 7 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c
index 36266d32..13e68be7 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-display-message.c,v 1.6 2009-11-19 22:35:10 tcunha Exp $ */
+/* $Id: cmd-display-message.c,v 1.7 2009-11-28 14:39:53 tcunha Exp $ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -30,8 +30,8 @@ int cmd_display_message_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_display_message_entry = {
"display-message", "display",
- CMD_TARGET_CLIENT_USAGE " [message]",
- CMD_ARG01, "",
+ "[-p] " CMD_TARGET_CLIENT_USAGE " [message]",
+ CMD_ARG01, "p",
cmd_target_init,
cmd_target_parse,
cmd_display_message_exec,
@@ -56,7 +56,10 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
template = data->arg;
msg = status_replace(c, NULL, template, time(NULL), 0);
- status_message_set(c, "%s", msg);
+ if (cmd_check_flag(data->chflags, 'p'))
+ ctx->print(ctx, "%s", msg);
+ else
+ status_message_set(c, "%s", msg);
xfree(msg);
return (0);
diff --git a/tmux.1 b/tmux.1
index ada46435..3b035009 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.208 2009-11-28 14:38:30 tcunha Exp $
+.\" $Id: tmux.1,v 1.209 2009-11-28 14:39:53 tcunha Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 22 2009 $
+.Dd $Mdocdate: November 24 2009 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -2011,11 +2011,17 @@ Ask for confirmation before executing
This command works only from inside
.Nm .
.It Xo Ic display-message
+.Op Fl p
.Op Fl t Ar target-client
.Op Ar message
.Xc
.D1 (alias: Ic display )
-Display a message in the status line.
+Display a message.
+If
+.Fl p
+is given, the output is printed to stdout, otherwise it is displayed in the
+.Ar target-client
+status line.
The format of
.Ar message
is as for