From 7b40e80a8f1e8ce851e9d43e6838360d8d7aa01a Mon Sep 17 00:00:00 2001 From: Mark Martinez Date: Thu, 13 Feb 2020 23:30:28 -0600 Subject: [PATCH] Fix `+file-template-p` to use `:when` keyword --- modules/editor/file-templates/config.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/editor/file-templates/config.el b/modules/editor/file-templates/config.el index ca887163e..8c19ab61d 100644 --- a/modules/editor/file-templates/config.el +++ b/modules/editor/file-templates/config.el @@ -118,11 +118,14 @@ information.") "Return t if RULE applies to the current buffer." (let ((pred (car rule)) (plist (cdr rule))) - (and (cond ((symbolp pred) (eq major-mode pred)) - ((and (stringp pred) buffer-file-name) - (string-match-p pred buffer-file-name)) - ((not (plist-member plist :when)) t) - ((funcall (plist-get plist :when) buffer-file-name))) + (and (or (and (symbolp pred) + (eq major-mode pred)) + (and (stringp pred) + (stringp buffer-file-name) + (string-match-p pred buffer-file-name) + (or (not (plist-member plist :when)) + (funcall (plist-get plist :when) + buffer-file-name)))) rule))) (defun +file-templates-check-h ()