From 60f395c8d6cee42addb0e6f17898419caef656dc Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 17 Jun 2016 16:01:18 -0400
Subject: [PATCH] Refactor core-docs.el

---
 core/core-docs.el          | 18 ++++++++++--------
 core/defuns/defuns-docs.el |  5 ++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/core-docs.el b/core/core-docs.el
index e8f3b8122..fce0485f5 100644
--- a/core/core-docs.el
+++ b/core/core-docs.el
@@ -5,20 +5,22 @@
   :commands (dash-at-point dash-at-point-with-docset dash-at-point-run-search
              dash-at-point-guess-docset)
   :init
-  (defmacro def-docset! (mode docset)
-    `(add-hook! ,mode (setq-local dash-at-point-docset ,docset)))
-  (defun doom-docs-lookup (&optional search docset)
-    (dash-at-point-run-search search docset)))
+  (defun doom-docs-lookup (&optional search all)
+    (let ((docset (unless all (dash-at-point-guess-docset))))
+      (dash-at-point-run-search search docset))))
 
 (use-package zeal-at-point
   :when (not IS-MAC)
   :commands (zeal-at-point zeal-at-point-set-docset)
   :init
-  (defmacro def-docset! (mode docset)
-    `(add-hook! ,mode (setq-local zeal-at-point-docset ,docset)))
-  (defun doom-docs-lookup (&optional search docset)
-    (let ((zeal-at-point-docset (or docset zeal-at-point-docset)))
+  (defun doom-docs-lookup (&optional search all)
+    (let ((zeal-at-point-docset (if all "" zeal-at-point-docset)))
       (zeal-at-point search))))
 
+(defmacro def-docset! (mode docset)
+  `(add-hook! ,mode
+     (setq-local ,(if IS-MAC 'dash-at-point-docset 'zeal-at-point-docset)
+                 ,docset)))
+
 (provide 'core-docs)
 ;;; core-docs.el ends here
diff --git a/core/defuns/defuns-docs.el b/core/defuns/defuns-docs.el
index d5f804d50..94b0a87a2 100644
--- a/core/defuns/defuns-docs.el
+++ b/core/defuns/defuns-docs.el
@@ -4,14 +4,13 @@
 (evil-define-command doom:docs-lookup (&optional bang input)
   "Look up INPUT (otherwise the current selection) in Dash or Zeal."
   (interactive "<!><a>")
-  (let ((docset (unless bang (dash-at-point-guess-docset)))
-        (query input))
+  (let ((query input))
     (when (evil-visual-state-p)
       (setq query (concat (buffer-substring-no-properties (region-beginning) (region-end))
                           " " query)))
     (when (or (not query) (zerop (length query)))
       (setq query (thing-at-point 'symbol)))
-    (doom-docs-lookup query docset)))
+    (doom-docs-lookup query bang)))
 
 (provide 'defuns-docs)
 ;;; defuns-docs.el ends here