emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix docset lookup & lazyload *-dash

Browse source 
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.
This commit is contained in:
Henrik Lissner 2018-06-15 21:37:36 +02:00
parent 7773a312aa
commit ef90633432
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/feature/lookup/autoload/docsets.el
View file

@ -1,6 +1,12 @@
;;; feature/lookup/autoload/docsets.el -*- lexical-binding: t; -*- ;;; feature/lookup/autoload/docsets.el -*- lexical-binding: t; -*-
;;;###if (featurep! +docsets) ;;;###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 ;;;###autodef
(defun set-docset! (modes &rest docsets) (defun set-docset! (modes &rest docsets)
"Registers a list of DOCSETS (strings) for MODES (either one major mode "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 () (lambda ()
(let (var-sym) (let (var-sym)
(cond ((featurep! :completion ivy) (cond ((featurep! :completion ivy)
(require 'counsel-dash)
(setq var-sym 'counsel-dash-docsets)) (setq var-sym 'counsel-dash-docsets))
((featurep! :completion helm) ((featurep! :completion helm)
(require 'helm-dash)
(setq var-sym 'helm-dash-docsets))) (setq var-sym 'helm-dash-docsets)))
(when var-sym (when var-sym
(let ((val (symbol-value var-sym))) (let ((val (symbol-value var-sym)))
(make-variable-buffer-local var-sym)
(pcase (car docsets) (pcase (car docsets)
(:add (:add
(set var-sym (append val (cdr docsets)))) (set var-sym (append val (cdr docsets))))