[Emacs-diffs] /srv/bzr/emacs/trunk r103374: * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use

[Michael Albinus]

------------------------------------------------------------
revno: 103374
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2011-02-21 20:14:56 +0100
message:
  * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use
  `field' property of `rfn-eshadow-overlay'.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-21 13:29:15 +0000
+++ b/lisp/ChangeLog    2011-02-21 19:14:56 +0000
@@ -1,3 +1,8 @@
+2011-02-21  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use
+       `field' property of `rfn-eshadow-overlay'.
+
 2011-02-21  Lars Ingebrigtsen  <address@hidden>
 
        * net/netrc.el (netrc-parse): Comment fix.
@@ -264,7 +269,7 @@
 
 2011-02-16  Alex Harsanyi  <address@hidden>
 
-       * 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.

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2011-02-13 12:25:45 +0000
+++ b/lisp/net/tramp.el 2011-02-21 19:14:56 +0000
@@ -1574,8 +1574,12 @@
     (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