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:

Merge pull request #214 from 0x0d/master
[etc/awesome.git] / widgets / calendar.lua
index 8c9e52a8b01ca19d2af15dc3a53dc9be4f02c4af..1a481cab64243a792c9c81fbabedf543d8244744 100644 (file)
@@ -50,7 +50,7 @@ function calendar:show(t_out, inc_offset, scr)
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         -- bg and fg inverted to highlight today
-                         f = io.popen(calendar.cal_format(today))
+        f = io.popen(calendar.cal_format(today))
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))
        local year = tonumber(os.date('%Y'))
@@ -58,13 +58,13 @@ function calendar:show(t_out, inc_offset, scr)
        month = month + calendar.offset
 
        while month > 12 do
-                            month = month - 12
-                year = year + 1
+           month = month - 12
+           year = year + 1
        end
 
        while month < 1 do
            month = month + 12
-                year = year - 1
+           year = year - 1
        end
 
        calendar.notify_icon = nil
@@ -100,7 +100,7 @@ function calendar:attach(widget, args)
     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"
-    calendar.cal_format  = args.ca_format or function(today)
+    calendar.cal_format  = args.cal_format or function(today)
         return string.format("%s | sed -r -e 's/_\\x08//g' -e '0,/(^| )%d($| )/ s/(^| )%d($| )/\\1<b><span foreground=\"%s\" background=\"%s\">%d<\\/span><\\/b>\\2/'",
                              calendar.cal, today, today, calendar.bg, calendar.fg, today)
     end