#221 use string.format; wiki updated

diff --git a/helpers.lua b/helpers.lua
index 8fb794c1f0e1cb790d02f65e27fb80825ff85b53..309162e7a3d8e098043a395417f9ad296c439fee 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -93,9 +93,9 @@ function helpers.newtimer(_name, timeout, fun, nostart)
     local name = timeout
     if not helpers.timer_table[name] then
         helpers.timer_table[name] = capi.timer({ timeout = timeout })
     local name = timeout
     if not helpers.timer_table[name] then
         helpers.timer_table[name] = capi.timer({ timeout = timeout })

+        helpers.timer_table[name]:start()

     end
     helpers.timer_table[name]:connect_signal("timeout", fun)
     end
     helpers.timer_table[name]:connect_signal("timeout", fun)

-    helpers.timer_table[name]:start()

     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end

diff --git a/util/quake.lua b/util/quake.lua
index be9258c0befbdafc6ad688ab5b0fde013c97cca6..771741e4cc3ea3eca3983c09dd6883bd2ecf33aa 100644 (file)
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -52,8 +52,9 @@ function quake:display()
 
    if not client then
        -- The client does not exist, we spawn it
 
    if not client then
        -- The client does not exist, we spawn it

-       awful.util.spawn(self.app .. " " .. string.format(self.argname, self.name) ..
-                        " " .. self.extra, false, self.screen)
+       awful.util.spawn(string.format("%s %s %s", self.app,
+                        string.format(self.argname, self.name), self.extra),
+                        false, self.screen)

        self.notexist = true
        return
    end
        self.notexist = true
        return
    end

diff --git a/wiki b/wiki
index 380e58f33a5a092cf36072458f7a2a4d1b07698e..8d62fdf794fe0d26802a7d0f7cf156e6b5b620f1 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 380e58f33a5a092cf36072458f7a2a4d1b07698e
+Subproject commit 8d62fdf794fe0d26802a7d0f7cf156e6b5b620f1