From 004a00f4ae0d64a86265c0fa6d6d52f0fa3d9434 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 19 Nov 2007 08:50:04 +0000 Subject: * progmodes/octave-mod.el (inferior-octave-send-list-and-digest): * play/yow.el (doctor-ret-or-read): * vc-hooks.el (vc-dired-resynch-file): * vc-hg.el (log-view-get-marked): * smerge-mode.el (ediff-cleanup-mess): * pcvs.el (vc-editable-p, vc-checkout): * pcomplete.el (comint-bol): * informat.el (texinfo-format-refill): * ido.el (tramp-tramp-file-p): * ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier) (ibuffer-generate-filter-groups) (ibuffer-format-filter-group-data): * add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as functions. * ido.el (ido-file-internal): Move with-no-warnings to include the ffap-string-at-point call. * pcomplete.el (pcomplete-executables): Move defsubst before first use. * vc-hg.el (vc-hg-revision-table): Fix last change. --- lisp/ido.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lisp/ido.el') 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) '()) -- cgit v1.2.1