[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master ee91405 3/3: Make fido-mode behave more like ido-mode when findin
From: |
João Távora |
Subject: |
master ee91405 3/3: Make fido-mode behave more like ido-mode when finding directories |
Date: |
Mon, 23 Dec 2019 18:44:50 -0500 (EST) |
branch: master
commit ee914051fbb4fbff9073a23b5ea7668bf48b5c6a
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Make fido-mode behave more like ido-mode when finding directories
Notably C-x d (M-x dired) and C-x v d (M-x vc-dir) behaved quite
differently, having regular files as the default instead of ido's
usual "./".
* lisp/icomplete.el (icomplete--sorted-completions): New helper.
(icomplete-completions): Use it.
---
lisp/icomplete.el | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 4d6dfcd..bf7e2ea 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -442,6 +442,24 @@ Usually run by inclusion in `minibuffer-setup-hook'."
(cdr tem)))))
(add-hook 'pre-command-hook 'icomplete-pre-command-hook nil t)
(add-hook 'post-command-hook 'icomplete-post-command-hook nil t)))
+
+(defun icomplete--sorted-completions ()
+ (let ((all (completion-all-sorted-completions
+ (icomplete--field-beg) (icomplete--field-end))))
+ (if (and fido-mode
+ (window-minibuffer-p)
+ (not minibuffer-default)
+ (eq (icomplete--category) 'file))
+ (cl-loop for l on all
+ while (listp (cdr l))
+ for comp = (cadr l)
+ when (string= comp "./")
+ do (setf (cdr l) (cddr l))
+ and return
+ (setq completion-all-sorted-completions (cons comp all))
+ finally return all)
+ all)))
+
@@ -550,8 +568,7 @@ matches exist."
(funcall predicate cand))))
predicate))
(md (completion--field-metadata (icomplete--field-beg)))
- (comps (completion-all-sorted-completions
- (icomplete--field-beg) (icomplete--field-end)))
+ (comps (icomplete--sorted-completions))
(last (if (consp comps) (last comps)))
(base-size (cdr last))
(open-bracket (if require-match "(" "["))