From 9e3682535af61f37e78a8c61f3935ad50c103284 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 6 Jan 2018 00:07:07 -0500
Subject: [PATCH] Fix describe-(function|variable) and ivy-resume

describe-(function|variable) weren't remapped to their counsel variants,
so ivy-resume wouldn't resume those sessions properly.
---
 modules/completion/ivy/autoload/ivy.el | 9 ---------
 modules/completion/ivy/config.el       | 3 ++-
 modules/private/default/+bindings.el   | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index e2467a099..aba051707 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -204,12 +204,3 @@ counsel-rg)."
          (re-search-forward (ivy--regex ivy-text t) (line-end-position) t)
          (run-hooks 'counsel-grep-post-action-hook)
          (selected-window))))))
-
-;;;###autoload
-(defun +ivy-quit-and-resume ()
-  "Close the current popup window and resume ivy."
-  (interactive)
-  (when (doom-popup-p)
-    (doom/popup-close))
-  (ivy-resume))
-
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index fa707c5ea..7ac6ba1b9 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -54,7 +54,8 @@ immediately runs it on the current candidate (ending the ivy session)."
         [remap projectile-find-file]      #'counsel-projectile-find-file
         [remap imenu-anywhere]            #'ivy-imenu-anywhere
         [remap execute-extended-command]  #'counsel-M-x
-        [remap describe-face]             #'counsel-describe-face)
+        [remap describe-function]         #'counsel-describe-function
+        [remap describe-variable]         #'counsel-describe-variable)
 
   ;; Show more buffer information in switch-buffer commands
   (ivy-set-display-transformer #'ivy-switch-buffer #'+ivy-buffer-transformer)
diff --git a/modules/private/default/+bindings.el b/modules/private/default/+bindings.el
index 24e346a0e..1bfaa4f0c 100644
--- a/modules/private/default/+bindings.el
+++ b/modules/private/default/+bindings.el
@@ -645,7 +645,7 @@
         :n "]]"  #'help-go-forward
         :n "o"   #'ace-link-help
         :n "q"   #'quit-window
-        :n "Q"   #'+ivy-quit-and-resume)
+        :n "Q"   #'ivy-resume)
 
       (:after vc-annotate
         :map vc-annotate-mode-map