From ef9063343229af32a2b544a97d553cc4935f139e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 15 Jun 2018 21:37:36 +0200 Subject: [PATCH] Fix docset lookup & lazyload *-dash Have to forward declare *-dash-docsets so we can lazy load the *-dash libraries. Also fixes a void-variable error because helm-dash-docsets isn't defined by helm-dash, just used. --- modules/feature/lookup/autoload/docsets.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/feature/lookup/autoload/docsets.el b/modules/feature/lookup/autoload/docsets.el index 27e6e7134..88196c1aa 100644 --- a/modules/feature/lookup/autoload/docsets.el +++ b/modules/feature/lookup/autoload/docsets.el @@ -1,6 +1,12 @@ ;;; feature/lookup/autoload/docsets.el -*- lexical-binding: t; -*- ;;;###if (featurep! +docsets) +(defvar-local helm-dash-docsets nil + "Docsets to use for this buffer.") + +(defvar-local counsel-dash-docsets nil + "Docsets to use for this buffer.") + ;;;###autodef (defun set-docset! (modes &rest docsets) "Registers a list of DOCSETS (strings) for MODES (either one major mode @@ -23,14 +29,11 @@ Used by `+lookup/in-docsets' and `+lookup/documentation'." (lambda () (let (var-sym) (cond ((featurep! :completion ivy) - (require 'counsel-dash) (setq var-sym 'counsel-dash-docsets)) ((featurep! :completion helm) - (require 'helm-dash) (setq var-sym 'helm-dash-docsets))) (when var-sym (let ((val (symbol-value var-sym))) - (make-variable-buffer-local var-sym) (pcase (car docsets) (:add (set var-sym (append val (cdr docsets))))