Revert "Autoinsert: Allow condition to be a function"

This reverts commit 738a7bb4949fdc93b0b637ac4c65423c928f0924.
It caused regressions in autoinsert-tests, and causes
conceptual problems due to its design.  (Bug#79178)

1 files changed, 7 insertions, 22 deletions

diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 3c4057f1623..e7492d1b9ed 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -323,10 +323,8 @@ The document was typeset with
 "))
   "A list specifying text to insert by default into a new file.
 Elements look like (CONDITION . ACTION) or ((CONDITION . DESCRIPTION) . ACTION).
-CONDITION may be a regexp that must match the new file's name or a symbol that
-must match the major mode for this element to apply.
-CONDITION can also be custom predicate function of no arguments; Emacs will
-insert the text if the predicate function returns non-nil.
+CONDITION may be a regexp that must match the new file's name, or it may be
+a symbol that must match the major mode for this element to apply.
 Only the first matching element is effective.
 Optional DESCRIPTION is a string for filling `auto-insert-prompt'.
 ACTION may be a skeleton to insert (see `skeleton-insert'), an absolute
@@ -370,25 +368,12 @@ Matches the visited file name against the elements of `auto-insert-alist'."
                 (pcase-lambda (`(,cond . ,action))
                   (if (atom cond)
                       (setq desc cond)
-                    ;; if `cond' is a lambda, don't split it but set `desc' to a custom string
-                    (if (and (not (symbolp cond)) (functionp cond))
-                        (setq desc "`lambda condition'")
-                      (setq desc (cdr cond)
-                            cond (car cond))))
-                  (when (cond
-                         ;; `cond' should be a major-mode variable
-                         ((and (symbolp cond) (not (functionp cond)))
-                          (derived-mode-p cond))
-
-                         ;; `cond' should be a predicate that takes no argument
-                         ;; It can either be a named function or a lambda
-                         ((functionp cond)
-                          (funcall cond))
-
-                         ;; cond should be a regexp
-                         (t
+                    (setq desc (cdr cond)
+                          cond (car cond)))
+                  (when (if (symbolp cond)
+                            (derived-mode-p cond)
                           (and buffer-file-name
-                               (string-match cond buffer-file-name))))
+                               (string-match cond buffer-file-name)))
                     action))
                 auto-insert-alist)))
          (goto-char 1)