revert fix coretemp

diff --git a/util/markup.lua b/util/markup.lua
index 0fc6ef6f37e88c0ccb11dbba5fe9236b95f9d019..346cfe173ff1e55d09d3424a23fce024cd9887b5 100644 (file)
--- a/util/markup.lua
+++ b/util/markup.lua
@@ -13,7 +13,7 @@ local setmetatable = setmetatable
 
 -- Lain markup util submodule
 -- lain.util.markup
 
 -- Lain markup util submodule
 -- lain.util.markup

-local markup = {}
+local markup = { fg = {}, bg = {} }

 
 -- Convenience tags.
 function markup.bold(text)      return '<b>'     .. text .. '</b>'     end
 
 -- Convenience tags.
 function markup.bold(text)      return '<b>'     .. text .. '</b>'     end


@@ -30,12 +30,12 @@ function markup.font(font, text)
 end
 
 -- Set the foreground.
 end
 
 -- Set the foreground.

-function markup.fgcolor(color, text)
+function markup.fg.color(color, text)

   return '<span foreground="' .. color .. '">' .. text .. '</span>'
 end
 
 -- Set the background.
   return '<span foreground="' .. color .. '">' .. text .. '</span>'
 end
 
 -- Set the background.

-function markup.bgcolor(color, text)
+function markup.bg.color(color, text)

   return '<span background="' .. color .. '">' .. text .. '</span>'
 end
 
   return '<span background="' .. color .. '">' .. text .. '</span>'
 end
 


@@ -49,5 +49,9 @@ function markup.fontcolor(font, fg, bg, text)
   return string.format('<span font="%s" foreground="%s" background="%s">%s</span>', font, fg, bg, text)
 end
 
   return string.format('<span font="%s" foreground="%s" background="%s">%s</span>', font, fg, bg, text)
 end
 

+-- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...)
+setmetatable(markup.fg, { __call = function(_, ...) return markup.fg.color(...) end })
+setmetatable(markup.bg, { __call = function(_, ...) return markup.bg.color(...) end })
+

 -- link markup(...) calls to markup.fg.color(...)
 return setmetatable(markup, { __call = function(_, ...) return markup.fg.color(...) end })
 -- link markup(...) calls to markup.fg.color(...)
 return setmetatable(markup, { __call = function(_, ...) return markup.fg.color(...) end })

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index c2945664f045f09377d13b818959572a08039deb..8501388d759bda3f8e698c68a327f9183f12326c 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -25,7 +25,7 @@ local function worker(args)
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 

-    cpu.widget = wibox.widget.textbox('')
+    cpu.widget = wibox.widget.textbox()

 
     function update()
         -- Read the amount of time the CPUs have spent performing
 
     function update()
         -- Read the amount of time the CPUs have spent performing

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 9c82b8b62823edecd2b3367e204a548fce4a0574..cdf30021bf42a4030d3695a3b785ee23f08e6c9d 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -26,7 +26,6 @@ local function worker(args)
 
     function update()
         local f = io.open(tempfile)
 
     function update()
         local f = io.open(tempfile)

-        local coretemp_now

         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()

diff --git a/wiki b/wiki
index eb533f62754d1403e01048b7f2006ab2d8c94b11..2a2beda916322177695fbd8b042b04001bc07509 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit eb533f62754d1403e01048b7f2006ab2d8c94b11
+Subproject commit 2a2beda916322177695fbd8b042b04001bc07509