aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Huber <rhuber@gmail.com>2016-03-11 15:33:14 +0000
committerRyan Huber <rhuber@gmail.com>2016-03-11 15:33:14 +0000
commitae29435767678193c506ef35933d48e6bc856420 (patch)
tree730747c7aa3c14fc5bf8d6ba438f67c424500f65
parent5946a4a109dcc1474ab53ccc9e2025cb6ed88867 (diff)
parentbd5d9d7e820b4724f0261483026609ed3938a039 (diff)
downloadwee-slack-ae29435767678193c506ef35933d48e6bc856420.tar.gz
Merge pull request #168 from irconan/server_buffer_merge
Add config parameter to merge server buffer with weechat core buffer
-rw-r--r--wee_slack.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/wee_slack.py b/wee_slack.py
index e3df8af..b289ac3 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -256,6 +256,8 @@ class SlackServer(object):
def create_local_buffer(self):
if not w.buffer_search("", self.server_buffer_name):
self.buffer = w.buffer_new(self.server_buffer_name, "buffer_input_cb", "", "", "")
+ if w.config_string(w.config_get('irc.look.server_buffer')) == 'merge_with_core':
+ w.buffer_merge(self.buffer, w.buffer_search_main())
w.buffer_set(self.buffer, "nicklist", "1")
def create_slack_websocket(self, data):