From a4d03654bdec21b2990e413f5d0d3acf63cce1be Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 31 May 2018 16:59:53 +0200 Subject: [PATCH] Fix associate!'s :files refusing a list of strings Due to changes under the hood, the :files FORM property requires FORM to either be a nested form of and/or sexps, or a single string. This is inconsistent with the plurality of ":files", so it has been fixed to accept a list of strings (with an implicit (and ...)). --- core/core-lib.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/core-lib.el b/core/core-lib.el index 2f306a227..b21d0fcc8 100644 --- a/core/core-lib.el +++ b/core/core-lib.el @@ -358,7 +358,10 @@ The available conditions are: (not (bound-and-true-p ,mode)) (and buffer-file-name (not (file-remote-p buffer-file-name))) ,(if match `(if buffer-file-name (string-match-p ,match buffer-file-name)) t) - ,(if files (doom--resolve-path-forms files '(doom-project-root)) t) + ,(if files (doom--resolve-path-forms + (if (stringp (car files)) (cons 'and files) files) + '(doom-project-root)) + t) ,(or pred-form t)) (,mode 1))) ,@(if (and modes (listp modes))