[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy-hydra 06886f1 055/395: ivy.el (ivy--tramp-prefix-p)
From: |
Basil L. Contovounesios |
Subject: |
[elpa] externals/ivy-hydra 06886f1 055/395: ivy.el (ivy--tramp-prefix-p): Extract |
Date: |
Thu, 25 Feb 2021 08:31:30 -0500 (EST) |
branch: externals/ivy-hydra
commit 06886f104eb0b459b79696fdc376e3e9618c4d7b
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>
ivy.el (ivy--tramp-prefix-p): Extract
Re #2335
---
ivy.el | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/ivy.el b/ivy.el
index a696887..40b0241 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1027,18 +1027,7 @@ contains a single candidate.")
(string-match-p "\\`[^/]+:.*:.*\\'" ivy-text))
(string-match-p "\\`/[^/]+:.*:.*\\'" ivy-text))
(ivy-done))
- ((or (and (equal ivy--directory "/")
- (cond ((string-match
- "\\`\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
- ivy-text)
- (setq ivy-text (ivy-state-current ivy-last)))
- ((string-match
- "\\`\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
- (ivy-state-current ivy-last))
- (setq ivy-text (ivy-state-current ivy-last)))))
- (string-match
- "\\`/\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
- ivy-text))
+ ((ivy--tramp-prefix-p)
(let ((method (match-string 1 ivy-text))
(user (match-string 2 ivy-text))
(rest (match-string 3 ivy-text))
@@ -1063,6 +1052,20 @@ contains a single candidate.")
(t
(ivy-done)))))
+(defun ivy--tramp-prefix-p ()
+ (or (and (equal ivy--directory "/")
+ (cond ((string-match
+ "\\`\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
+ ivy-text)
+ (setq ivy-text (ivy-state-current ivy-last)))
+ ((string-match
+ "\\`\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
+ (ivy-state-current ivy-last))
+ (setq ivy-text (ivy-state-current ivy-last)))))
+ (string-match
+ "\\`/\\([^/]+?\\):\\(?:\\(.*\\)@\\)?\\(.*\\)\\'"
+ ivy-text)))
+
(defun ivy-expand-file-if-directory (file-name)
"Expand FILE-NAME as directory.
When this directory doesn't exist, return nil."
- [elpa] externals/ivy-hydra 3d9c222 069/395: swiper.el (swiper--query-replace-updatefn): Fix, (continued)
- [elpa] externals/ivy-hydra 3d9c222 069/395: swiper.el (swiper--query-replace-updatefn): Fix, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra c7973a8 083/395: counsel.el (counsel-set-variable): Fix killing the expression, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra e7eca37 085/395: counsel.el (counsel-switch-buffer-preview-virtual-buffers): Add, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra eae1ccf 086/395: ivy.el (ivy-auto-shrink-minibuffer): New defcustom, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra f16e6e2 094/395: counsel.el (counsel-flycheck-errors-cands): Show the error, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 400a900 265/395: ivy.el (ivy-backward-delete-char): Forward to counsel-up-directory, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra edccbd7 270/395: ivy.el (ivy-completion-in-region): Use collection in place of all-completions, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 0f4cb44 051/395: ivy.el (ivy-add-prompt-count): Account for :dynamic-collection returning 0, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra cab01f3 053/395: ivy.el (ivy--reset-state): Add listp check, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra abfb283 054/395: ivy-overlay.el (ivy-display-function-overlay): Fix for org-current-level, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 06886f1 055/395: ivy.el (ivy--tramp-prefix-p): Extract,
Basil L. Contovounesios <=
- [elpa] externals/ivy-hydra d2052ba 017/395: counsel.el (counsel--company-display-transformer): Add, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 1020a77 026/395: swiper.el (swiper-query-replace): Show matched groups in preview, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra c0b61ea 028/395: swiper.el (swiper--query-replace-setup): Highlight at eobp, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 412266f 038/395: swiper.el (swiper--line-at-point): Don't error on empty string, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra e598b04 042/395: ivy.el (ivy--regex): Improve handling of capture groups, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra f42723e 046/395: ivy.el (ivy-done): Let it go through the rest of conditions if confirmation is not required., Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 6abc3de 050/395: .travis.yml: Use 2 xenial recipes, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra ecb098d 049/395: counsel.el (counsel-imenu): Add counsel-imenu-history., Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 657e6b4 062/395: ivy-test.el (ivy-inhibit-action): Better behavior with an alist collection, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 4ba0944 064/395: counsel.el (counsel-set-variable): Save expr to the kill ring, Basil L. Contovounesios, 2021/02/25