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

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

[nongnu] elpa/git-commit a7953b2645: Revert "magit-completing-read-multi


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit a7953b2645: Revert "magit-completing-read-multiple*: Suppress consult with NO-SPLIT"
Date: Tue, 31 May 2022 09:58:25 -0400 (EDT)

branch: elpa/git-commit
commit a7953b2645503904b2a31e18e019f07af9e71a7a
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Revert "magit-completing-read-multiple*: Suppress consult with NO-SPLIT"
    
    This reverts commit aa1b88777031d2daae879cc54be8d0d652b3660b.
    
    The `consult-completing-read-multiple' has been deprecated in Consult
    0.18.  If it is still used, then it disables itself on first use and
    arranges for `completing-read-multiple' to be used.
    
    See https://github.com/magit/magit/issues/4437#issuecomment-1119843297.
---
 lisp/magit-base.el | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 4dbfbfefc6..516265afc8 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -669,25 +669,10 @@ third-party completion frameworks."
        ;; when reading commit ranges. 798aff564
        (helm-crm-default-separator
         (if no-split nil (bound-and-true-p helm-crm-default-separator)))
-       (values
-        (if (and no-split
-                 (advice-member-p 'consult-completing-read-multiple
-                                  'completing-read-multiple))
-            ;; Our NO-SPLIT hack is not compatible with `CONSULT's
-            ;; implementation so fall back to the original function.
-            ;; #4437
-            (unwind-protect
-                (progn
-                  (advice-remove 'completing-read-multiple
-                                 'consult-completing-read-multiple)
-                  (completing-read-multiple
-                   prompt table predicate require-match initial-input
-                   hist def inherit-input-method))
-              (advice-add 'completing-read-multiple :override
-                          'consult-completing-read-multiple))
-          (completing-read-multiple
-           prompt table predicate require-match initial-input
-           hist def inherit-input-method))))
+       ;; And now, the moment we have all been waiting for...
+       (values (completing-read-multiple
+                prompt table predicate require-match initial-input
+                hist def inherit-input-method)))
     (if no-split input values)))
 
 (defun magit-ido-completing-read



reply via email to

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