From 5393fc99b3855aed4b4d25881b9862a6d9426d71 Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Sun, 28 Jan 2018 11:06:37 +0100
Subject: [PATCH] [Helm] Refactoring configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There were troubles loading helm when running emacs as daemon, supposedly caused
by a faulty helm configuration.  Now ‘helm-config’ get’s loaded regardless of
whether ‘db/run-init’ is run or not, to allow to change the default keybinding
for ‘helm-command-prefix’ using ‘bind-key’.
---
 init.el | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/init.el b/init.el
index 20c8d7b..19bfe36 100644
--- a/init.el
+++ b/init.el
@@ -230,7 +230,7 @@
   (when (package-installed-p 'helm)
     (bind-key "M-y" #'helm-show-kill-ring)
     (bind-key "C-c h" #'helm-command-prefix)
-    (bind-key "C-c h #" #'helm-emms))
+    (bind-key "#" #'helm-emms helm-command-map))
 
   (when (package-installed-p 'crux)
     (bind-key [remap kill-whole-line] #'crux-kill-whole-line)
@@ -878,19 +878,19 @@ are assumed to be of the form *.crt."
 (use-package hippie-exp
   :commands (hippie-expand))
 
-(use-package helm-config
-  :commands (helm-show-kill-ring
-             helm-command-prefix)
+(use-package helm
+  :commands (helm-show-kill-ring)
   :diminish helm-mode
-  :defines (helm-command-prefix-key
-            helm-command-map
-            helm-completing-read-handlers-alist)
+  :init   (progn
+            (eval-when-compile
+              (require 'helm-config))   ; autoloads and keybindings
+            (unbind-key helm-command-prefix-key))
   :config (progn
             (eval-when-compile
-              (require 'helm)
               (require 'helm-mode)
               (require 'helm-buffers)
               (require 'helm-ring))
+
             (setq helm-input-idle-delay 0.0
                   helm-buffers-fuzzy-matching t
                   helm-mode-fuzzy-match t
@@ -908,8 +908,6 @@ are assumed to be of the form *.crt."
                   helm-buffer-details-flag t
                   helm-buffer-skip-remote-checking t)
 
-            (unbind-key helm-command-prefix-key)
-
             (bind-key "<tab>" 'helm-execute-persistent-action helm-map)
             (bind-key "C-i" 'helm-execute-persistent-action helm-map)
             (bind-key "C-z" 'helm-select-action helm-map)