From f213fbdf5cce2d8195298cadb6ed8eca6cc0d349 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 1 Apr 2017 23:33:18 -0400 Subject: [PATCH] lang/web: improve +web-angularjs-mode detection --- modules/lang/web/config.el | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/lang/web/config.el b/modules/lang/web/config.el index 147da7de7..69d4e0b0a 100644 --- a/modules/lang/web/config.el +++ b/modules/lang/web/config.el @@ -37,15 +37,15 @@ (def-project-mode! +web-angularjs-mode :modes (+javascript-npm-mode +web-bower-mode) :when - (and (or (bound-and-true-p +web-bower-mode) - (bound-and-true-p +javascript-npm-mode)) - (let* ((project-root (doom-project-root)) - (bower (and +web-bower-mode (+web-bower-conf project-root))) - (npm (and +javascript-npm-mode (+javascript-npm-conf project-root)))) - (assq 'angular (append (cdr (assq 'dependencies bower)) - (cdr (assq 'dependencies npm)) - (cdr (assq 'devDependencies bower)) - (cdr (assq 'devDependencies npm))))))) + (let* ((project-root (doom-project-root)) + (bower (and (bound-and-true-p +web-bower-mode) + (+web-bower-conf project-root))) + (npm (and (bound-and-true-p +javascript-npm-mode) + (+javascript-npm-conf project-root)))) + (assq 'angular (append (cdr (assq 'dependencies bower)) + (cdr (assq 'dependencies npm)) + (cdr (assq 'devDependencies bower)) + (cdr (assq 'devDependencies npm)))))) (def-project-mode! +web-jekyll-mode :modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode)