emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2537 from licebmi/develop

Browse source 
Fix `+file-template-p` to use `:when` keyword
This commit is contained in:
Henrik Lissner 2020-02-14 17:31:25 -05:00 • committed by GitHub
commit 3259907ab7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/editor/file-templates/config.el
View file

@ -118,11 +118,14 @@ information.")
"Return t if RULE applies to the current buffer." "Return t if RULE applies to the current buffer."
(let ((pred (car rule)) (let ((pred (car rule))
(plist (cdr rule))) (plist (cdr rule)))
(and (cond ((symbolp pred) (eq major-mode pred)) (and (or (and (symbolp pred)
((and (stringp pred) buffer-file-name) (eq major-mode pred))
(string-match-p pred buffer-file-name)) (and (stringp pred)
((not (plist-member plist :when)) t) (stringp buffer-file-name)
((funcall (plist-get plist :when) 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))) rule)))
(defun +file-templates-check-h () (defun +file-templates-check-h ()