]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merged with upstream
authorJosh Timmer <0ohexxo0@gmail.com>
Thu, 17 Sep 2015 19:38:44 +0000 (15:38 -0400)
committerJosh Timmer <0ohexxo0@gmail.com>
Thu, 17 Sep 2015 19:38:44 +0000 (15:38 -0400)
widgets/calendar.lua
wiki

index b811f705733fb2a62797c3e8bed1b1b028f53bd9..4714a546f353dedd8c4ed1fecc71e105fd3d1659 100644 (file)
@@ -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 a24a74924b80b7293d0f4171a855f1eb23ab90cc..d7aa1a7b8428211a1c4c71865fd64302e013d62b 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit a24a74924b80b7293d0f4171a855f1eb23ab90cc
+Subproject commit d7aa1a7b8428211a1c4c71865fd64302e013d62b