From 482fdc04c7931ec4ba3d574496fed97a6dca08e4 Mon Sep 17 00:00:00 2001
From: "R. Steve McKown" <rsmckown@gmail.com>
Date: Sun, 14 Jun 2015 00:37:07 -0600
Subject: [PATCH] dwmrc: re-merge ~/.Xresources

To work around a lightdm bug (it merges with -nocpp), re-merge here so
that our #defines work.  There is an outstanding launchpad bug on this
issue: #1244578.  It may not be 'fixed'.
---
 dwmrc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dwmrc b/dwmrc
index c2a2a1c..aed08e1 100755
--- a/dwmrc
+++ b/dwmrc
@@ -11,6 +11,11 @@
 #     exec dwm.custom
 # fi
 
+# Although the system startup merged ~/.Xresources, it did so with the -nocpp
+# option (Ubuntu 14.04), which prevents the use of #define, etc.  Re-merge here
+# for correct behavior.
+xrdb -merge ~/.Xresources
+
 # Initial startup volume to sane level
 pactl set-sink-volume $(pactl info | grep "Default Sink:" | awk '{ print $3}') '30%'
 
-- 
2.39.2