emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/helm 8958fa41a1 5/7: Make helm-mm-3p-match an alias of hel


From: ELPA Syncer
Subject: [nongnu] elpa/helm 8958fa41a1 5/7: Make helm-mm-3p-match an alias of helm-mm-3f-match
Date: Thu, 26 Jun 2025 04:01:53 -0400 (EDT)

branch: elpa/helm
commit 8958fa41a126348bc58f344ebea433af12d9b3f4
Author: Thierry Volpiatto <thievol@posteo.net>
Commit: Thierry Volpiatto <thievol@posteo.net>

    Make helm-mm-3p-match an alias of helm-mm-3f-match
---
 helm-multi-match.el | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/helm-multi-match.el b/helm-multi-match.el
index 935db0b98c..81eb18b73c 100644
--- a/helm-multi-match.el
+++ b/helm-multi-match.el
@@ -310,7 +310,7 @@ CANDIDATE starting at end of first match."
              for pref-re = (if end re (concat "\\`" re))
              always (funcall predicate
                              (prog1 (condition-case _err
-                                        (string-match re candidate end)
+                                        (string-match pref-re candidate end)
                                       (invalid-regexp nil))
                                (unless end
                                  (setq end (match-end 0))))))))
@@ -318,25 +318,12 @@ CANDIDATE starting at end of first match."
 ;;; multiple regexp pattern 3 with prefix search
 ;;
 ;;
-(defun helm-mm-3p-match (candidate &optional pattern)
+(defalias 'helm-mm-3p-match #'helm-mm-3f-match
   "Check if PATTERN match CANDIDATE.
 Same as `helm-mm-3-match' but only for the cdr of patterns, the car of
 patterns must always match CANDIDATE prefix.
 E.g. \"bar foo baz\" will match \"barfoobaz\" or \"barbazfoo\" but not
-\"foobarbaz\" whereas `helm-mm-3-match' would match all."
-  (let* ((pat (helm-mm-3-get-patterns (or pattern helm-pattern)))
-         (first (car pat))
-         end)
-    (and (funcall (car first)
-                  (prog1 (string-match (concat "\\`" (cdr first)) candidate)
-                    (setq end (match-end 0))))
-         ;; Avoid searching again in common part by searching from end of 
prefix
-         ;; match.
-         (cl-loop for (predicate . regexp) in (cdr pat)
-                  always (funcall predicate
-                                  (condition-case _err
-                                      (string-match regexp candidate end)
-                                    (invalid-regexp nil)))))))
+\"foobarbaz\" whereas `helm-mm-3-match' would match all.")
 
 (defun helm-mm-3p-search (pattern &rest _ignore)
   (helm-mm-3-search-base



reply via email to

[Prev in Thread] Current Thread [Next in Thread]