From dca7d1c0fd9dc16aca2337c078da7441dbf97eeb Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 31 Mar 2014 21:41:35 +0000
Subject: Make message-limit a server option.

---
 status.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'status.c')

diff --git a/status.c b/status.c
index 84589427..bf528b0d 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++) {
-- 
cgit 


From 8880bdb67c9d939ec53506d05f5ce1d75be10c97 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 2 Apr 2014 17:08:23 +0000
Subject: Do not replace ## with # in status_replace1 because it'll be done
 later by the format code.

---
 status.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'status.c')

diff --git a/status.c b/status.c
index bf528b0d..029be4c8 100644
--- a/status.c
+++ b/status.c
@@ -396,9 +396,6 @@ status_replace1(struct client *c, char **iptr, char **optr, char *out,
 	case '{':
 		ptr = (char *) "#{";
 		goto do_replace;
-	case '#':
-		*(*optr)++ = '#';
-		break;
 	default:
 		xsnprintf(tmp, sizeof tmp, "#%c", *(*iptr - 1));
 		ptr = tmp;
-- 
cgit