From 813114efa142674a7109a6b92f66c66e6a37dba5 Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Wed, 13 Jan 2016 00:37:26 -0500
Subject: [PATCH] Unify key bindings for helm/ivy-spacemacs-help

SPC h .        helm/ivy-spacemacs-help-dotspacemacs
SPC h SPC      helm/ivy-spacemacs-help
SPC h f        helm/ivy-spacemacs-help-faq
SPC h l        helm/ivy-spacemacs-help-layers
SPC h p        helm/ivy-spacemacs-help-packages
SPC h r        helm/ivy-spacemacs-help-docs
SPC h t        helm/ivy-spacemacs-help-toggles
---
 .../helm-spacemacs-help.el                    | 45 ++++++++++++++++++-
 layers/+completion/spacemacs-helm/packages.el | 17 ++++++-
 layers/+completion/spacemacs-ivy/packages.el  | 18 ++++++--
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/layers/+completion/spacemacs-helm/local/helm-spacemacs-help/helm-spacemacs-help.el b/layers/+completion/spacemacs-helm/local/helm-spacemacs-help/helm-spacemacs-help.el
index 913156e13..459b6b2af 100644
--- a/layers/+completion/spacemacs-helm/local/helm-spacemacs-help/helm-spacemacs-help.el
+++ b/layers/+completion/spacemacs-helm/local/helm-spacemacs-help/helm-spacemacs-help.el
@@ -72,10 +72,51 @@
                    ,(helm-spacemacs-help//faq-source))))
 
 ;;;###autoload
-(defun helm-spacemacs-help-faq (arg)
-  "Looking in the FAQ with helm."
+(defun helm-spacemacs-help-dotspacemacs ()
+  "Helm session to search for dotfile variables."
+  (interactive)
+  (helm-spacemacs-help-mode)
+  (helm :buffer "*helm: spacemacs*"
+        :sources `(,(helm-spacemacs-help//dotspacemacs-source))))
+
+;;;###autoload
+(defun helm-spacemacs-help-layers ()
+  "Helm session to search for layers."
+  (interactive)
+  (helm-spacemacs-help-mode)
+  (helm :buffer "*helm: spacemacs*"
+        :sources `(,(helm-spacemacs-help//layer-source))))
+
+;;;###autoload
+(defun helm-spacemacs-help-packages (arg)
+  "Helm session to search for packages."
   (interactive "P")
   (helm-spacemacs-help-mode)
+  (helm-spacemacs-help//init arg)
+  (helm :buffer "*helm: spacemacs*"
+        :sources `(,(helm-spacemacs-help//package-source))))
+
+;;;###autoload
+(defun helm-spacemacs-help-docs ()
+  "Helm session to search for documentation."
+  (interactive)
+  (helm-spacemacs-help-mode)
+  (helm :buffer "*helm: spacemacs*"
+        :sources `(,(helm-spacemacs-help//documentation-source))))
+
+;;;###autoload
+(defun helm-spacemacs-help-toggles ()
+  "Helm session to search for toggles."
+  (interactive)
+  (helm-spacemacs-help-mode)
+  (helm :buffer "*helm: spacemacs*"
+        :sources `(,(helm-spacemacs-help//toggle-source))))
+
+;;;###autoload
+(defun helm-spacemacs-help-faq ()
+  "Helm session to search for the FAQ."
+  (interactive)
+  (helm-spacemacs-help-mode)
   (helm :buffer "*helm: spacemacs*"
         :sources `(,(helm-spacemacs-help//faq-source))))
 
diff --git a/layers/+completion/spacemacs-helm/packages.el b/layers/+completion/spacemacs-helm/packages.el
index 1469b9d56..04d19684c 100644
--- a/layers/+completion/spacemacs-helm/packages.el
+++ b/layers/+completion/spacemacs-helm/packages.el
@@ -871,7 +871,13 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
 
 (defun spacemacs-helm/init-helm-spacemacs-help ()
   (use-package helm-spacemacs-help
-    :commands (helm-spacemacs-help helm-spacemacs-help-faq)
+    :commands (helm-spacemacs-help-dotspacemacs
+               helm-spacemacs-help
+               helm-spacemacs-help-faq
+               helm-spacemacs-help-layers
+               helm-spacemacs-help-packages
+               helm-spacemacs-help-docs
+               helm-spacemacs-help-toggles)
     :init
     (progn
       (defun spacemacs-base/helm-spacemacs-deprecated (arg)
@@ -883,7 +889,14 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
         (helm-spacemacs arg))
       (spacemacs/set-leader-keys "feh" 'spacemacs-base/helm-spacemacs-deprecated)
       (spacemacs/set-leader-keys "fef" 'helm-spacemacs-help-faq)
-      (spacemacs/set-leader-keys "h SPC" 'helm-spacemacs-help))))
+      (spacemacs/set-leader-keys
+        "h ."   'helm-spacemacs-help-dotspacemacs
+        "h SPC" 'helm-spacemacs-help
+        "h f"   'helm-spacemacs-help-faq
+        "h l"   'helm-spacemacs-help-layers
+        "h p"   'helm-spacemacs-help-packages
+        "h r"   'helm-spacemacs-help-docs
+        "h t"   'helm-spacemacs-help-toggles))))
 
 (defun spacemacs-helm/init-helm-swoop ()
   (use-package helm-swoop
diff --git a/layers/+completion/spacemacs-ivy/packages.el b/layers/+completion/spacemacs-ivy/packages.el
index dc6b08fb3..2508e887d 100644
--- a/layers/+completion/spacemacs-ivy/packages.el
+++ b/layers/+completion/spacemacs-ivy/packages.el
@@ -286,11 +286,21 @@ Helm hack."
 
 (defun spacemacs-ivy/init-ivy-spacemacs-help ()
   (use-package ivy-spacemacs-help
+    :commands (ivy-spacemacs-help-dotspacemacs
+               ivy-spacemacs-help
+               ivy-spacemacs-help-faq
+               ivy-spacemacs-help-layers
+               ivy-spacemacs-help-packages
+               ivy-spacemacs-help-docs
+               ivy-spacemacs-help-toggles)
     :init (spacemacs/set-leader-keys
-            "h SPC"  'ivy-spacemacs-help-docs
-            "h ."    'ivy-spacemacs-help-dotspacemacs
-            "h l"    'ivy-spacemacs-help
-            "h t"    'ivy-spacemacs-help-toggles)))
+            "h ."   'ivy-spacemacs-help-dotspacemacs
+            "h SPC" 'ivy-spacemacs-help
+            "h f"   'ivy-spacemacs-help-faq
+            "h l"   'ivy-spacemacs-help-layers
+            "h p"   'ivy-spacemacs-help-packages
+            "h r"   'ivy-spacemacs-help-docs
+            "h t"   'ivy-spacemacs-help-toggles)))
 
 (defun spacemacs-ivy/init-swiper ()
   (use-package swiper