diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-03-08 16:28:56 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-03-08 16:28:56 +0000 |
| commit | 77603c4f2de1961b3da141b3e6e4ce2f983365d4 (patch) | |
| tree | 4ea1533af8574a91a074fbebea204380f5e00dc8 /status.c | |
| parent | 7019f77c05f45ea9267f7e768d0abb0b6a928a25 (diff) | |
| parent | 9880114aff0b48649f00266125da1dc3c94a70eb (diff) | |
| download | rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.tar.gz rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.tar.bz2 rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'status.c')
| -rw-r--r-- | status.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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++) { |