From: Josh Timmer <0ohexxo0@gmail.com>
Date: Thu, 17 Sep 2015 19:38:44 +0000 (-0400)
Subject: Merged with upstream
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/06621e5bdd737749cda8adf1c84d72a2ba468475?hp=ea618041941e4107dd14af7103e87912305615a9

Merged with upstream
---

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index b811f70..4714a54 100644
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -113,8 +113,7 @@ function calendar:attach(widget, args)
     calendar.cal         = args.cal or "/usr/bin/cal"
     calendar.post_cal    = args.post_cal or ""
     calendar.icons       = args.icons or icons_dir .. "cal/white/"
-    calendar.font        = args.font or beautiful.font:sub(beautiful.font:find(""),
-                           beautiful.font:find(" "))
+    calendar.font        = args.font or beautiful.font:gsub(" %d.*", "")
     calendar.font_size   = tonumber(args.font_size) or 11
     calendar.fg          = args.fg or beautiful.fg_normal or "#FFFFFF"
     calendar.bg          = args.bg or beautiful.bg_normal or "#000000"
diff --git a/wiki b/wiki
index a24a749..d7aa1a7 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit a24a74924b80b7293d0f4171a855f1eb23ab90cc
+Subproject commit d7aa1a7b8428211a1c4c71865fd64302e013d62b