Merged with upstream

This commit is contained in:
Josh Timmer 2015-09-17 15:38:44 -04:00
commit 06621e5bdd
2 changed files with 2 additions and 3 deletions

View File

@ -113,8 +113,7 @@ function calendar:attach(widget, args)
calendar.cal = args.cal or "/usr/bin/cal" calendar.cal = args.cal or "/usr/bin/cal"
calendar.post_cal = args.post_cal or "" calendar.post_cal = args.post_cal or ""
calendar.icons = args.icons or icons_dir .. "cal/white/" calendar.icons = args.icons or icons_dir .. "cal/white/"
calendar.font = args.font or beautiful.font:sub(beautiful.font:find(""), calendar.font = args.font or beautiful.font:gsub(" %d.*", "")
beautiful.font:find(" "))
calendar.font_size = tonumber(args.font_size) or 11 calendar.font_size = tonumber(args.font_size) or 11
calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF" calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF"
calendar.bg = args.bg or beautiful.bg_normal or "#000000" calendar.bg = args.bg or beautiful.bg_normal or "#000000"

2
wiki

@ -1 +1 @@
Subproject commit a24a74924b80b7293d0f4171a855f1eb23ab90cc Subproject commit d7aa1a7b8428211a1c4c71865fd64302e013d62b