From cbe05e6df41d71f3c051a166be1368d69cafc921 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 5 Sep 2019 13:03:43 -0400 Subject: [PATCH] Soften formatting rules for envvar files doom-load-envvar-file would fail if there weren't two newlines indicating "the start of the envvar list", or if envvars were commented out/were padded with whitespace. These rules have been relaxed. --- core/core.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/core.el b/core/core.el index df4138747..9467207e7 100644 --- a/core/core.el +++ b/core/core.el @@ -424,8 +424,7 @@ in interactive sessions, nil otherwise (but logs a warning)." (let (vars) (with-temp-buffer (insert-file-contents file) - (search-forward "\n\n") - (while (re-search-forward "\n\\([^= \n]+\\)=" nil t) + (while (re-search-forward "\n *[^#] *\\([^= \n]+\\)=" nil t) (save-excursion (let ((var (match-string 1)) (value (buffer-substring-no-properties