branch: master
commit 1046fc72a8e2117a3ec3e6dc9b979c488c8bc618
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
ivy.el (ivy-avy): Use non-obsolete avy-process
In place of the now obsolete `avy--process'.
---
ivy.el | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/ivy.el b/ivy.el
index 022b9b6..d0bc000 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1573,7 +1573,7 @@ This string is inserted into the minibuffer."
(avy-style (or (cdr (assq 'ivy-avy avy-styles-alist))
avy-style))
(avy-action #'ivy--avy-action))
- (avy--process
+ (avy-process
(ivy--avy-candidates))))
(defun ivy-sort-file-function-default (x y)
@@ -2838,14 +2838,14 @@ Possible choices are
'ivy-magic-slash-non-match-cd-selected,
(if (and ivy--directory
(equal ivy-text ""))
(let* ((cands (cl-loop for pair in process-environment
- for (var val) = (split-string pair "=" t)
- if (and val (not (equal "" val)))
- if (file-exists-p
- (if (file-name-absolute-p val)
- val
- (setq val
- (expand-file-name val
ivy--directory))))
- collect (cons var val)))
+ for (var val) = (split-string pair "=" t)
+ if (and val (not (equal "" val)))
+ if (file-exists-p
+ (if (file-name-absolute-p val)
+ val
+ (setq val
+ (expand-file-name val ivy--directory))))
+ collect (cons var val)))
(enable-recursive-minibuffers t)
(x (ivy-read "Env: " cands))
(path (cdr (assoc x cands))))
