# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1555900110 14400
# Node ID 4a5c3d4626d42733623b523f2b7f0af476515d9c
# Parent  62f9cb575c0f08e77e7beeedc8dbe027c2c3ca2e# Parent  7452a4fd1499d9d5a1975151510a42d0318848db
Merge.

diff -r 7452a4fd1499 -r 4a5c3d4626d4 stumpwmrc
--- a/stumpwmrc	Sat Apr 20 13:18:03 2019 -0400
+++ b/stumpwmrc	Sun Apr 21 22:28:30 2019 -0400
@@ -177,7 +177,7 @@
         for (output commands) in `((,extern ("--off"))
                                    (,laptop ("--off"))
 
-                                   (,extern ("--auto"))
+                                   (,laptop ("--auto"))
                                    (,extern ("--primary")))
         do (uiop:run-program `("xrandr" "--output" ,output ,@commands))))
 
diff -r 7452a4fd1499 -r 4a5c3d4626d4 weechat/plugins.conf
--- a/weechat/plugins.conf	Sat Apr 20 13:18:03 2019 -0400
+++ b/weechat/plugins.conf	Sun Apr 21 22:28:30 2019 -0400
@@ -73,6 +73,9 @@
 python.slack.auto_open_threads = "false"
 python.slack.background_load_all_history = "false"
 python.slack.channel_name_typing_indicator = "true"
+python.slack.color_buflist_muted_channels = "darkgray"
+python.slack.color_reaction_suffix = "darkgray"
+python.slack.color_thread_suffix = "lightcyan"
 python.slack.colorize_private_chats = "false"
 python.slack.debug_level = "3"
 python.slack.debug_mode = "false"
@@ -94,6 +97,7 @@
 python.slack.slack_api_token = "xoxp-3324703083-436133997184-447755985685-90585fad41071ee30fb518ad29831038"
 python.slack.slack_timeout = "20000"
 python.slack.switch_buffer_on_join = "true"
+python.slack.thread_messages_in_channel = "false"
 python.slack.thread_suffix_color = "lightcyan"
 python.slack.unfurl_auto_link_display = "both"
 python.slack.unfurl_ignore_alt_text = "false"
@@ -118,6 +122,9 @@
 python.slack.auto_open_threads = "Automatically open threads when mentioned or inresponse to own messages."
 python.slack.background_load_all_history = "Load history for each channel in the background as soon as it opens, rather than waiting for the user to look at it."
 python.slack.channel_name_typing_indicator = "Change the prefix of a channel from # to > when someone is typing in it. Note that this will (temporarily) affect the sort order if you sort buffers by name rather than by number."
+python.slack.color_buflist_muted_channels = "Color to use for muted channels in the buflist"
+python.slack.color_reaction_suffix = "Color to use for the [:wave:(@user)] suffix on messages that have reactions attached to them."
+python.slack.color_thread_suffix = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.colorize_private_chats = "Whether to use nick-colors in DM windows."
 python.slack.debug_level = "Show only this level of debug info (or higher) when debug_mode is on. Lower levels -> more messages."
 python.slack.debug_mode = "Open a dedicated buffer for debug messages and start logging to it. How verbose the logging is depends on log_level."
@@ -138,6 +145,7 @@
 python.slack.slack_api_token = "List of Slack API tokens, one per Slack instance you want to connect to. See the README for details on how to get these."
 python.slack.slack_timeout = "How long (ms) to wait when communicating with Slack."
 python.slack.switch_buffer_on_join = "When /joining a channel, automatically switch to it as well."
+python.slack.thread_messages_in_channel = "When enabled shows thread messages in the parent channel."
 python.slack.thread_suffix_color = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.unfurl_auto_link_display = "When displaying ("unfurling") links to channels/users/etc, determine what is displayed when the text matches the url without the protocol. This happens when Slack automatically creates links, e.g. from words separated by dots or email addresses. Set it to "text" to only display the text written by the user, "url" to only display the url or "both" (the default) to display both."
 python.slack.unfurl_ignore_alt_text = "When displaying ("unfurling") links to channels/users/etc, ignore the "alt text" present in the message and instead use the canonical name of the thing being linked to."