[elpa] externals/tempel ff685def5b 3/5: Revert "Use :when as :enable-funcion in tempel-abbrev-mode (#149)"

[ELPA Syncer]

branch: externals/tempel
commit ff685def5b4dad2752b6b331a47398e0cbd48b1c
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Revert "Use :when as :enable-funcion in tempel-abbrev-mode (#149)"
    
    This reverts commit 17d3f2c1e8cf782dedcb7bfdc7201b075bfd272d.
---
 tempel.el | 83 +++++++++++++++++++++++----------------------------------------
 1 file changed, 30 insertions(+), 53 deletions(-)

diff --git a/tempel.el b/tempel.el
index cb79b3be10..00f7d9d782 100644
--- a/tempel.el
+++ b/tempel.el
@@ -490,27 +490,25 @@ This is meant to be a source in 
`tempel-template-sources'."
       (unless (equal (car tempel--path-templates) timestamps)
         (setq tempel--path-templates (cons timestamps
                                            (mapcan #'tempel--file-read 
files))))))
-
   (cl-loop
    for (modes plist . templates) in (cdr tempel--path-templates)
-   if (tempel--mode-matches-p modes)
-   collect (list modes plist templates)))
-
-(defun tempel--mode-matches-p (modes)
-  "Return non-nil if one of MODES matches."
-  (cl-loop
-   for m in modes thereis
-   (or (eq m #'fundamental-mode)
-       (derived-mode-p m)
-       (when-let ((remap (alist-get m (bound-and-true-p 
major-mode-remap-alist))))
-         (derived-mode-p remap)))))
-
-(defun tempel--eval-condition (condition)
-  "Return non-nil if CONDITION is satisfied."
-  (save-excursion
-    (save-restriction
-      (save-match-data
-        (eval condition 'lexical)))))
+   if (tempel--condition-p modes plist)
+   append templates))
+
+(defun tempel--condition-p (modes plist)
+  "Return non-nil if one of MODES matches and the PLIST condition is 
satisfied."
+  (and
+   (cl-loop
+    for m in modes thereis
+    (or (eq m #'fundamental-mode)
+        (derived-mode-p m)
+        (when-let ((remap (alist-get m (bound-and-true-p 
major-mode-remap-alist))))
+          (derived-mode-p remap))))
+   (or (not (plist-member plist :when))
+       (save-excursion
+         (save-restriction
+           (save-match-data
+             (eval (plist-get plist :when) 'lexical)))))))
 
 (defun tempel--templates ()
   "Return templates for current mode."
@@ -525,16 +523,6 @@ This is meant to be a source in `tempel-template-sources'."
        nil))
     result))
 
-
-(defun tempel--enabled-templates ()
-  "Return enabled templates for the current mode."
-  (cl-loop
-     for (modes plist templates) in (tempel--templates)
-     if (tempel--eval-condition (if-let (condition (plist-get plist :when))
-                                    (tempel--eval-condition condition)
-                                  t))
-     append templates))
-
 (defun tempel--region ()
   "Return region bounds."
   (when (use-region-p)
@@ -699,7 +687,7 @@ command."
   (interactive (list t))
   (if interactive
       (tempel--interactive #'tempel-expand)
-    (when-let ((templates (tempel--enabled-templates))
+    (when-let ((templates (tempel--templates))
                (bounds (tempel--prefix-bounds))
                (name (buffer-substring-no-properties
                       (car bounds) (cdr bounds)))
@@ -726,7 +714,7 @@ Capf, otherwise like an interactive completion command."
           (insert tempel-trigger-prefix))
         (tempel--interactive #'tempel-complete))
     (let ((region (tempel--region)))
-      (when-let ((templates (tempel--enabled-templates))
+      (when-let ((templates (tempel--templates))
                  (bounds (or (and (not region) (tempel--prefix-bounds))
                              (and (not tempel-trigger-prefix) (cons (point) 
(point))))))
         (list (car bounds) (cdr bounds)
@@ -757,7 +745,7 @@ If called interactively, select a template with 
`completing-read'."
   (interactive (list nil))
   (tempel--insert
    (if (consp template-or-name) template-or-name
-     (let* ((templates (or (tempel--enabled-templates)
+     (let* ((templates (or (tempel--templates)
                            (error "Tempel: No templates for %s" major-mode)))
             (completion-extra-properties
              (and tempel-insert-annotation
@@ -808,27 +796,16 @@ If called interactively, select a template with 
`completing-read'."
             (default-value 'abbrev-minor-mode-table-alist))
     (kill-local-variable 'abbrev-minor-mode-table-alist))
   (when tempel-abbrev-mode
-      (cl-loop
-       for (modes plist templates) in (tempel--templates)
-       do (let ((table (make-abbrev-table)))
-            (dolist (template templates)
-              (let* ((name (symbol-name (car template)))
-                     (hook (make-symbol name)))
-                (fset hook (apply-partially #'tempel--abbrev-hook name (cdr 
template)))
-                (put hook 'no-self-insert t)
-                (define-abbrev table name 'Template hook :system t)))
-
-            (when-let (condition (plist-get plist :when))
-              (abbrev-table-put table
-                                :enable-function
-                                (lambda ()
-                                  (tempel--eval-condition condition))))
-
-
-            (setq-local abbrev-minor-mode-table-alist
-                        (cons `(tempel-abbrev-mode . ,table)
-                              abbrev-minor-mode-table-alist))
-            ))))
+    (let ((table (make-abbrev-table)))
+      (dolist (template (tempel--templates))
+        (let* ((name (symbol-name (car template)))
+               (hook (make-symbol name)))
+          (fset hook (apply-partially #'tempel--abbrev-hook name (cdr 
template)))
+          (put hook 'no-self-insert t)
+          (define-abbrev table name 'Template hook :system t)))
+      (setq-local abbrev-minor-mode-table-alist
+                  (cons `(tempel-abbrev-mode . ,table)
+                        abbrev-minor-mode-table-alist)))))
 
 ;;;###autoload
 (define-globalized-minor-mode global-tempel-abbrev-mode