From: luke bonham <dadasignificanulla@gmail.com>
Date: Sat, 15 Mar 2014 10:13:49 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/copycat-killer/lain
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/67865e6426dfe0d74d0d9fff7a7c29c729823684?hp=f66038b40ca44710233c4af9446ce0aa842dd7a6

Merge branch 'master' of https://github.com/copycat-killer/lain
---

diff --git a/widgets/bat.lua b/widgets/bat.lua
index c14e94c..1d8f8c3 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -124,7 +124,7 @@ local function worker(args)
         -- notifications for low and critical states
         if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
         then
-            local nperc = tonumber(bat_now.perc)
+            local nperc = tonumber(bat_now.perc) or 100
             if nperc <= 5
             then
                 bat.id = naughty.notify({
diff --git a/wiki b/wiki
index 434d32a..b35f693 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 434d32a7dac5770ed7ddd1581967df7d7aeb76be
+Subproject commit b35f6931d9685d53e10a051c1d558151331b041f