From 420f672661cc98421b19242db41b83b8ecf51b33 Mon Sep 17 00:00:00 2001
From: boxofrox <charetjc@gmail.com>
Date: Sun, 29 Jan 2017 08:59:57 -0500
Subject: [PATCH] doc: porting guide corrections, addition, and cleanup (#1486)

- added note that `awesome.quit` must be wrapped in an anonymous
  function when used as a menu command.
- corrected tasklist diff to include missing lines from rc.lua.  the
  porting guide code doesn't make much sense otherwise.
- cleaned up diff columns on a couple other code blocks.

Signed-off-by: Justin Charette <charetjc@gmail.com>
---
 docs/17-porting-tips.md | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/17-porting-tips.md b/docs/17-porting-tips.md
index a66214ba4..f63572a17 100644
--- a/docs/17-porting-tips.md
+++ b/docs/17-porting-tips.md
@@ -94,9 +94,22 @@ work. Remove this section.
     - end
     --- }}}
 
+The `quit` menu command must be wrapped in a function, otherwise an error
+occurs due to mismatched argument types from the v4.0 `awful.menu` library.
+
+     -- {{{ Menu
+     -- Create a laucher widget and a main menu
+     myawesomemenu = {
+       { "manual", terminal .. " -e man awesome" },
+       { "edit config", editor_cmd .. " " .. awesome.conffile },
+       { "restart", awesome.restart },
+    -  { "quit", awesome.quit }
+    +  { "quit", function() awesome.quit() end}
+     }
+
 The textclock is now part of the `wibox` library, rename it.
 
-    -- {{{ Wibar
+     -- {{{ Wibar
      -- Create a textclock widget
     -mytextclock = `awful.widget.textclock`()
     +mytextclock = `wibox.widget.textclock`()
@@ -105,7 +118,7 @@ The textclock is now part of the `wibox` library, rename it.
 Widgets were previously added to static global tables. This isn't going to
 behave correctly when screen are added and removed. Remove this section.
 
-      -- Create a wibox for each screen and add it
+     --- Create a wibox for each screen and add it
      -mywibox = {}
      -mypromptbox = {}
      -mylayoutbox = {}
@@ -143,6 +156,7 @@ they are still supported, but will be removed in the next release.
                           awful.button({ }, 1, function (c)
                                                    if c == `client.focus` then
                                                        c.minimized = true
+                                                   else
                                                        -- Without this, the following
                                                        -- :isvisible() makes no sense
                                                        c.minimized = false
@@ -153,6 +167,7 @@ they are still supported, but will be removed in the next release.
                                                        end
                                                        -- This will also un-minimize
                                                        -- the client, if needed
+                                                       `client.focus` = c
                                                        c:raise()
                                                    end
                                                end),