The branch, master has been updated
via 683ca270d4b3ffc64a0d9cb86161dfb48a7fe0ca (commit)
from 78e783e7863eb33981da4a5ad48dd9e2aa2b08dd (commit)
- Log -----------------------------------------------------------------
commit 683ca270d4b3ffc64a0d9cb86161dfb48a7fe0ca
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Make message-limit a server option.
---
options-table.c | 14 +++++++-------
status.c | 6 +-----
tmux.1 | 10 +++++-----
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/options-table.c b/options-table.c
index 64d3edc..7b09a68 100644
--- a/options-table.c
+++ b/options-table.c
@@ -80,6 +80,13 @@ const struct options_table_entry server_options_table[] = {
.default_num = 0
},
+ { .name = "message-limit",
+ .type = OPTIONS_TABLE_NUMBER,
+ .minimum = 0,
+ .maximum = INT_MAX,
+ .default_num = 100
+ },
+
{ .name = "quiet",
.type = OPTIONS_TABLE_FLAG,
.default_num = 0 /* overridden in main() */
@@ -234,13 +241,6 @@ const struct options_table_entry session_options_table[] =
{
.style = "message-style"
},
- { .name = "message-limit",
- .type = OPTIONS_TABLE_NUMBER,
- .minimum = 0,
- .maximum = INT_MAX,
- .default_num = 20
- },
-
{ .name = "message-style",
.type = OPTIONS_TABLE_STYLE,
.default_str = "bg=yellow,fg=black"
diff --git a/status.c b/status.c
index 9967dc6..e8bbf4c 100644
--- a/status.c
+++ b/status.c
@@ -655,7 +655,6 @@ void printflike2
status_message_set(struct client *c, const char *fmt, ...)
{
struct timeval tv;
- struct session *s = c->session;
struct message_entry *msg;
va_list ap;
int delay;
@@ -673,10 +672,7 @@ status_message_set(struct client *c, const char *fmt, ...)
msg->msg_time = time(NULL);
msg->msg = xstrdup(c->message_string);
- if (s == NULL)
- limit = 0;
- else
- limit = options_get_number(&s->options, "message-limit");
+ limit = options_get_number(&global_options, "message-limit");
if (ARRAY_LENGTH(&c->message_log) > limit) {
limit = ARRAY_LENGTH(&c->message_log) - limit;
for (i = 0; i < limit; i++) {
diff --git a/tmux.1 b/tmux.1
index 4d09052..2e17c65 100644
--- a/tmux.1
+++ b/tmux.1
@@ -782,7 +782,7 @@ Show client messages or server information.
Any messages displayed on the status line are saved in a per-client message
log, up to a maximum of the limit set by the
.Ar message-limit
-session option for the session attached to that client.
+server option.
With
.Fl t ,
display the log for
@@ -2138,6 +2138,10 @@ passed through to applications running in
.Nm .
Attached clients should be detached and attached again after changing this
option.
+.It Ic message-limit Ar number
+Set the number of error or information messages to save in the message log for
+each client.
+The default is 100.
.It Xo Ic quiet
.Op Ic on | off
.Xc
@@ -2359,10 +2363,6 @@ With the
flag to the
.Ic set-option
command the new style is added otherwise the existing style is replaced.
-.It Ic message-limit Ar number
-Set the number of error or information messages to save in the message log for
-each client.
-The default is 20.
.It Ic message-style Ar style
Set status line message style.
For how to specify
-----------------------------------------------------------------------
Summary of changes:
options-table.c | 14 +++++++-------
status.c | 6 +-----
tmux.1 | 10 +++++-----
3 files changed, 13 insertions(+), 17 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
