From c451a06123fc90f949b7f734944b80c44033db4f Mon Sep 17 00:00:00 2001 From: Thierry Volpiatto Date: Fri, 15 Jul 2022 19:58:57 +0200 Subject: [PATCH] Revert "Try to fix issue #2504 in eshell completion" This reverts commit 452dd1baebb765bf633f37818cd63c6f085f89b9. --- helm-mode.el | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/helm-mode.el b/helm-mode.el index e037d5839..701aee8de 100644 --- a/helm-mode.el +++ b/helm-mode.el @@ -1968,11 +1968,7 @@ Can be used for `completion-in-region-function' by advicing it with an (string= input "")) " ")) (file-comp-p (or (eq (completion-metadata-get metadata 'category) 'file) - (and (helm-mode--in-file-completion-p) - ;; Probably unneeded at this - ;; point but never know. - (setq metadata (append metadata '((category . file)))) - t) + (helm-mode--in-file-completion-p) ;; Assume that when `afun' and `predicate' are null ;; we are in filename completion. (and (null afun) (null predicate)))) @@ -1993,23 +1989,7 @@ Can be used for `completion-in-region-function' by advicing it with an metadata)) (last-data (last comps)) (bs (helm-aif (cdr last-data) - ;; Try to fix eshell completion - ;; which fails to complete a - ;; filename not preceded by - ;; a meaningful - ;; command like cd or ls - ;; (bug #2504) so - ;; try to find the last - ;; leading / and set - ;; base-size from it. - (prog1 (if (and (zerop it) file-comp-p) - (or (helm-aand - (save-excursion - (re-search-backward - "/" start t)) - (- (1+ it) start)) - it) - it) + (prog1 it ;; Remove the last element of ;; comps by side-effect. (setcdr last-data nil))