From 7ec9e8018f7460f0b873b60ff2fb7732dd258f83 Mon Sep 17 00:00:00 2001
From: actionless <actionless.loveless@gmail.com>
Date: Thu, 2 Jul 2020 07:24:44 +0200
Subject: [PATCH 1/2] feat(awful: hotkeys_popup: vim): add vimdiff

---
 lib/awful/hotkeys_popup/keys/vim.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/awful/hotkeys_popup/keys/vim.lua b/lib/awful/hotkeys_popup/keys/vim.lua
index fdfa6f88..f211f1cc 100644
--- a/lib/awful/hotkeys_popup/keys/vim.lua
+++ b/lib/awful/hotkeys_popup/keys/vim.lua
@@ -173,6 +173,16 @@ local vim_keys = {
             zR="open all",
         }
     }},
+
+    ["VIM: diff"] = {{
+        modifiers = {},
+        keys = {
+            ["do"]="diff obtain",
+            ["dp"]="diff put",
+            ["]c"]="jump next",
+            ["[c"]="jump previos",
+        }
+    }},
 }
 
 hotkeys_popup.add_hotkeys(vim_keys)

From 639f0196d8d7e7b0d7ed8a5ad84666c30e9f4a22 Mon Sep 17 00:00:00 2001
From: Yauhen Kirylau <actionless.loveless@gmail.com>
Date: Thu, 2 Jul 2020 18:35:45 +0200
Subject: [PATCH 2/2] fixup: typo

---
 lib/awful/hotkeys_popup/keys/vim.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/awful/hotkeys_popup/keys/vim.lua b/lib/awful/hotkeys_popup/keys/vim.lua
index f211f1cc..cbb2a28e 100644
--- a/lib/awful/hotkeys_popup/keys/vim.lua
+++ b/lib/awful/hotkeys_popup/keys/vim.lua
@@ -180,7 +180,7 @@ local vim_keys = {
             ["do"]="diff obtain",
             ["dp"]="diff put",
             ["]c"]="jump next",
-            ["[c"]="jump previos",
+            ["[c"]="jump previous",
         }
     }},
 }