Fix #1712, #1719: project minor modes not activating

This commit is contained in:
Henrik Lissner
2019-08-28 12:50:53 -04:00
parent 9e122c6847
commit 851b51357e

View File

@ -228,9 +228,9 @@ Relevant: `doom-project-hook'."
(let ((fn (let ((fn
`(lambda () `(lambda ()
(and (not (bound-and-true-p ,name)) (and (not (bound-and-true-p ,name))
(and buffer-file-name (not (file-remote-p buffer-file-name nil t))) (and buffer-file-name (not (file-remote-p buffer-file-name nil t)))
,(or (null match) ,(or (null match)
`(if buffer-file-name (string-match-p ,match buffer-file-name))) `(if buffer-file-name (string-match-p ,match buffer-file-name)))
,(or (null files) ,(or (null files)
;; Wrap this in `eval' to prevent eager expansion ;; Wrap this in `eval' to prevent eager expansion
;; of `project-file-exists-p!' from pulling in ;; of `project-file-exists-p!' from pulling in
@ -242,7 +242,7 @@ Relevant: `doom-project-hook'."
(,name 1))))) (,name 1)))))
`((dolist (mode ,modes) `((dolist (mode ,modes)
(let ((hook-name (let ((hook-name
(intern (format "doom--enable-%s%s-h" ',name (intern (format "doom--enable-%s%s-h" ',name
(if (eq mode t) "" (format "-in-%s" mode)))))) (if (eq mode t) "" (format "-in-%s" mode))))))
(fset hook-name #',fn) (fset hook-name #',fn)
(if (eq mode t) (if (eq mode t)