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

lang/web: improve +web-angularjs-mode detection

Browse source
This commit is contained in:
Henrik Lissner 2017-04-01 23:33:18 -04:00
parent 1175fb60e7
commit f213fbdf5c
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/lang/web/config.el
View file

@ -37,15 +37,15 @@
(def-project-mode! +web-angularjs-mode (def-project-mode! +web-angularjs-mode
:modes (+javascript-npm-mode +web-bower-mode) :modes (+javascript-npm-mode +web-bower-mode)
:when :when
(and (or (bound-and-true-p +web-bower-mode) (let* ((project-root (doom-project-root))
(bound-and-true-p +javascript-npm-mode)) (bower (and (bound-and-true-p +web-bower-mode)
(let* ((project-root (doom-project-root)) (+web-bower-conf project-root)))
(bower (and +web-bower-mode (+web-bower-conf project-root))) (npm (and (bound-and-true-p +javascript-npm-mode)
(npm (and +javascript-npm-mode (+javascript-npm-conf project-root)))) (+javascript-npm-conf project-root))))
(assq 'angular (append (cdr (assq 'dependencies bower)) (assq 'angular (append (cdr (assq 'dependencies bower))
(cdr (assq 'dependencies npm)) (cdr (assq 'dependencies npm))
(cdr (assq 'devDependencies bower)) (cdr (assq 'devDependencies bower))
(cdr (assq 'devDependencies npm))))))) (cdr (assq 'devDependencies npm))))))
(def-project-mode! +web-jekyll-mode (def-project-mode! +web-jekyll-mode
:modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode) :modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode)