PORTREVISION=	1

--- lib/awful/rules.lua.in

+++ lib/awful/rules.lua.in

@@ -89,7 +89,9 @@ end

 --- Apply rules to a client.

 -- @param c The client.

-function apply(c)

+-- @param startup Executed at startup ? (optional, default is false)

+function apply(c, startup)

+    startup = startup or false

     local props = {}

     local callbacks = {}

     for _, entry in ipairs(rules) do

@@ -129,6 +131,9 @@ function apply(c)

         callback(c)

     end

+    -- Apply tags.

+    atag.withcurrent(c, startup)

+

     -- Do this at last so we do not erase things done by the focus

     -- signal.

     if props.focus then

--- lib/awful/tag.lua.in

+++ lib/awful/tag.lua.in

@@ -374,7 +374,6 @@ capi.client.add_signal("manage", function(c, startup)

             c.screen = capi.mouse.screen

         end

     end

-    withcurrent(c, startup)

     c:add_signal("property::screen", withcurrent)

 end)