summaryrefslogtreecommitdiff
path: root/lisp/ido.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ido.el')
-rw-r--r--lisp/ido.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ido.el b/lisp/ido.el
index 0a077f9dab6..af8936b86d9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2281,9 +2281,10 @@ If cursor is not at the end of the user input, move to end of input."
filename t))
((and ido-use-filename-at-point
- (setq fn (if (eq ido-use-filename-at-point 'guess)
- (with-no-warnings (ffap-guesser))
- (ffap-string-at-point)))
+ (setq fn (with-no-warnings
+ (if (eq ido-use-filename-at-point 'guess)
+ (ffap-guesser)
+ (ffap-string-at-point))))
(not (string-match "^http:/" fn))
(setq d (file-name-directory fn))
(file-directory-p d))
@@ -3363,6 +3364,8 @@ for first matching file."
(nconc ido-temp-list items)
(setq ido-temp-list items)))
+(declare-function tramp-tramp-file-p "net/tramp" (name))
+
(defun ido-file-name-all-completions-1 (dir)
(cond
((ido-nonreadable-directory-p dir) '())