[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master bae8e46 361/399: ivy.el (ivy--magic-file-doubleslash-direc
From: |
Oleh Krehel |
Subject: |
[elpa] master bae8e46 361/399: ivy.el (ivy--magic-file-doubleslash-directory): Cd remote "/" on "//" |
Date: |
Sat, 20 Jul 2019 14:57:59 -0400 (EDT) |
branch: master
commit bae8e46cfdb405758efbe8df0e30c92696f2d02d
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy--magic-file-doubleslash-directory): Cd remote "/" on "//"
Re #1487
---
ivy.el | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/ivy.el b/ivy.el
index 59da864..043fd72 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2903,6 +2903,20 @@ Possible choices are
'ivy-magic-slash-non-match-cd-selected,
(make-directory dir)
(ivy--cd dir))
+(defun ivy--magic-file-doubleslash-directory ()
+ "Return an appropriate directory for when two slashes are entered."
+ (let (remote)
+ (cond
+ ;; Windows
+ ((string-match "\\`[[:alpha:]]:/" ivy--directory)
+ (match-string 0 ivy--directory))
+ ;; Remote root if on remote
+ ((setq remote (file-remote-p ivy--directory))
+ (concat remote "/"))
+ ;; Local root
+ (t
+ "/"))))
+
(defun ivy--magic-file-slash ()
"Handle slash when completing file names."
(when (or (and (eq this-command #'self-insert-command)
@@ -2913,9 +2927,8 @@ Possible choices are
'ivy-magic-slash-non-match-cd-selected,
(cond ((member ivy-text ivy--all-candidates)
(ivy--cd canonical))
((string-match-p "//\\'" ivy-text)
- (ivy--cd (if (string-match "\\`[[:alpha:]]:/" default-directory)
- (match-string 0 default-directory)
- "/")))
+ (ivy--cd
+ (ivy--magic-file-doubleslash-directory)))
((string-match-p "\\`/ssh:" ivy-text)
(ivy--cd (file-name-directory ivy-text)))
((string-match "[[:alpha:]]:/\\'" ivy-text)
- [elpa] master 1c436f6 347/399: ivy.el (ivy-reverse-i-search): Don't call another ivy-reverse-i-search, (continued)
- [elpa] master 1c436f6 347/399: ivy.el (ivy-reverse-i-search): Don't call another ivy-reverse-i-search, Oleh Krehel, 2019/07/20
- [elpa] master 975c2af 348/399: ivy.el (ivy-reverse-i-search): Error when called from top-level, Oleh Krehel, 2019/07/20
- [elpa] master 888b417 350/399: ivy.el (ivy--recompute-index-inhibit): Add, Oleh Krehel, 2019/07/20
- [elpa] master 4c9c14a 356/399: ivy.el (ivy--minibuffer-cleanup): Rename from ivy--cleanup, Oleh Krehel, 2019/07/20
- [elpa] master 4324211 354/399: ivy.el (ivy-read): Factor out transformer-fn, Oleh Krehel, 2019/07/20
- [elpa] master d52c176 351/399: ivy.el (ivy-switch-buffer-kill): Move from "C-c C-k" to "C-k", Oleh Krehel, 2019/07/20
- [elpa] master 7925637 353/399: ivy.el (ivy--compute-extra-candidates): Extract, Oleh Krehel, 2019/07/20
- [elpa] master f6876a7 359/399: ivy.el (ivy-read): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 460d6e3 355/399: ivy.el (ivy-read): Refactor, Oleh Krehel, 2019/07/20
- [elpa] master ebac0e9 352/399: ivy.el (ivy--compute-extra-actions): Extract, Oleh Krehel, 2019/07/20
- [elpa] master bae8e46 361/399: ivy.el (ivy--magic-file-doubleslash-directory): Cd remote "/" on "//",
Oleh Krehel <=
- [elpa] master a87bdd2 358/399: ivy.el (ivy-read): Refactor, Oleh Krehel, 2019/07/20
- [elpa] master 5e1c468 357/399: ivy.el (ivy--cleanup): Extract, Oleh Krehel, 2019/07/20
- [elpa] master 520fd83 360/399: ivy.el (ivy-read): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 2d22e05 363/399: doc/ivy.org: Add more info on TRAMP, Oleh Krehel, 2019/07/20
- [elpa] master 180d329 365/399: swiper.el (swiper--re-builder): Improve for char-fold-to-regexp, Oleh Krehel, 2019/07/20
- [elpa] master 4e9e310 368/399: ivy.el (ivy-read): Fix swiper-query-replace not working, Oleh Krehel, 2019/07/20
- [elpa] master a0b71a1 362/399: ivy.el (ivy--magic-tilde-directory): Cd remote "~" on "~", Oleh Krehel, 2019/07/20
- [elpa] master 3af75cf 364/399: swiper.el (swiper--positive-regexps): Extract, Oleh Krehel, 2019/07/20
- [elpa] master 916e281 367/399: ivy.el (ivy-read): Fix bad refactor, Oleh Krehel, 2019/07/20
- [elpa] master 1ea4ebb 370/399: Fix minor typo, Oleh Krehel, 2019/07/20