From: Michael Albinus Date: Mon, 21 Feb 2011 19:14:56 +0000 (+0100) Subject: * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~774^2~3 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c63090455fe67ba5788aa23a5223655c2cbe9351;p=emacs.git * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use `field' property of `rfn-eshadow-overlay'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20514a0b886..05c765e0881 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-21 Michael Albinus + + * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use + `field' property of `rfn-eshadow-overlay'. + 2011-02-21 Lars Ingebrigtsen * net/netrc.el (netrc-parse): Comment fix. @@ -264,7 +269,7 @@ 2011-02-16 Alex Harsanyi - * soap-client.el (soap-well-known-xmlns, soap-local-xmlns) + * net/soap-client.el (soap-well-known-xmlns, soap-local-xmlns) (soap-default-xmlns, soap-target-xmlns, soap-multi-refs) (soap-decoded-multi-refs, soap-current-wsdl) (soap-encoded-namespaces): Rename CL-style *...* variables. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 9be093743b5..fc167d6e62e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1574,8 +1574,12 @@ special handling of `substitute-in-file-name'." (let ((props (tramp-compat-funcall 'overlay-properties (symbol-value 'rfn-eshadow-overlay)))) (while props - (tramp-compat-funcall - 'overlay-put tramp-rfn-eshadow-overlay (pop props) (pop props)))))) + ;; The `field' property prevents correct minibuffer + ;; completion; we exclude it. + (if (not (eq (car props) 'field)) + (tramp-compat-funcall + 'overlay-put tramp-rfn-eshadow-overlay (pop props) (pop props)) + (pop props) (pop props)))))) (when (boundp 'rfn-eshadow-setup-minibuffer-hook) (add-hook 'rfn-eshadow-setup-minibuffer-hook