Ticket #48931: patch-awesomerc.lua.in.diff.diff

patch-awesomerc.lua.in.diff

@@ -1 @@
---- awesomerc.lua.in.orig       2013-04-01 06:44:46.000000000 -0500
-+++ awesomerc.lua.in    2013-09-30 05:39:20.000000000 -0500
-@@ -297,7 +297,7 @@
- -- This should map on the top row of your keyboard, usually 1 to 9.
+--- awesomerc.lua.in.orig       2015-09-19 23:45:57.000000000 -0700
++++ awesomerc.lua.in    2015-09-19 23:46:17.000000000 -0700
+@@ -300,7 +300,7 @@
  for i = 1, 9 do
      globalkeys = awful.util.table.join(globalkeys,
+         -- View tag only.
 -        awful.key({ modkey }, "#" .. i + 9,
-+        awful.key({ modkey }, "" .. i,
++        awful.key({ modkey }, "" .. i + 9,
                    function ()
                          local screen = mouse.screen
                          local tag = awful.tag.gettags(screen)[i]
-@@ -305,7 +305,7 @@
-                            awful.tag.viewonly(tag)
+@@ -309,7 +309,7 @@
                          end
                    end),
+         -- Toggle tag.
 -        awful.key({ modkey, "Control" }, "#" .. i + 9,
-+        awful.key({ modkey, "Control" }, "" .. i,
++        awful.key({ modkey, "Control" }, "" .. i + 9,
                    function ()
                        local screen = mouse.screen
                        local tag = awful.tag.gettags(screen)[i]
-@@ -313,14 +313,14 @@
-                          awful.tag.viewtoggle(tag)
+@@ -318,7 +318,7 @@
                        end
                    end),
+         -- Move client to tag.
 -        awful.key({ modkey, "Shift" }, "#" .. i + 9,
-+        awful.key({ modkey, "Shift" }, "" .. i,
++        awful.key({ modkey, "Shift" }, "" .. i + 9,
                    function ()
-                       local tag = awful.tag.gettags(client.focus.screen)[i]
-                       if client.focus and tag then
-                           awful.client.movetotag(tag)
+                       if client.focus then
+                           local tag = awful.tag.gettags(client.focus.screen)[i]
+@@ -328,7 +328,7 @@
                       end
                    end),
+         -- Toggle tag.
 -        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
-+        awful.key({ modkey, "Control", "Shift" }, "" .. i,
++        awful.key({ modkey, "Control", "Shift" }, "" .. i + 9,
                    function ()
-                       local tag = awful.tag.gettags(client.focus.screen)[i]
-                       if client.focus and tag then
+                       if client.focus then
+                           local tag = awful.tag.gettags(client.focus.screen)[i]