From fe4429fa407508c076ec7c3222718bdbd8e8654a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 21 Feb 2017 03:46:22 -0500
Subject: [PATCH] completion/helm: update for v2 (untested)

---
 modules/completion/helm/config.el | 33 +++++++++++++++++--------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el
index 437d5fa34..a1bdb9a60 100644
--- a/modules/completion/helm/config.el
+++ b/modules/completion/helm/config.el
@@ -1,30 +1,18 @@
 ;;; completion/helm/config.el
 
-;; TODO Untested in DOOM v2.0
+;; Warning: since I don't use helm, this may be out of date.
 
 (defvar +helm-global-prompt "››› "
   "The helm text prompt prefix string is globally replaced with this string.")
 
-(@map [remap find-file] 'helm-find-files
-      [remap switch-to-buffer] 'doom/helm-buffers-dwim
-      [remap projectile-switch-to-buffer] (λ! (doom/helm-buffers-dwim t))
-      [remap recentf]            'helm-recentf
-      [remap projectile-recentf] 'helm-projectile-recentf
-      [remap projectile-find-file] 'helm-projectile-find-file
-      [remap imenu]              'helm-semantic-or-imenu
-      [remap bookmark-jump]      'helm-bookmarks
-      [remap noop-show-kill-ring] 'helm-show-kill-ring
-      [remap projectile-switch-project] 'helm-projectile-switch-project
-      [remap projectile-find-file] 'helm-projectile-find-file
-      [remap imenu-anywhere]  'helm-imenu-anywhere
-      [remap execute-extended-command] 'helm-M-x)
+
 
 
 ;;
 ;; Packages
 ;;
 
-(@def-package helm
+(@def-package helm :demand t
   :init
   (setq helm-quick-update t
         ;; Speedier without fuzzy matching
@@ -86,6 +74,21 @@
   (require 'helm-mode)
   (helm-mode +1)
 
+  (@map :map helm-mode-map
+        [remap find-file] 'helm-find-files
+        [remap switch-to-buffer] 'doom/helm-buffers-dwim
+        [remap projectile-switch-to-buffer] (λ! (doom/helm-buffers-dwim t))
+        [remap recentf]            'helm-recentf
+        [remap projectile-recentf] 'helm-projectile-recentf
+        [remap projectile-find-file] 'helm-projectile-find-file
+        [remap imenu]              'helm-semantic-or-imenu
+        [remap bookmark-jump]      'helm-bookmarks
+        [remap noop-show-kill-ring] 'helm-show-kill-ring
+        [remap projectile-switch-project] 'helm-projectile-switch-project
+        [remap projectile-find-file] 'helm-projectile-find-file
+        [remap imenu-anywhere]  'helm-imenu-anywhere
+        [remap execute-extended-command] 'helm-M-x)
+
   (defvar helm-projectile-find-file-map (make-sparse-keymap))
   (require 'helm-projectile)
   (set-keymap-parent helm-projectile-find-file-map helm-map))