# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1145278616 0
# Node ID def3f4aee2805c0d9df78e34525c1d9ce8d2b2bf
# Parent  80049d479c75faa365073465fb3e98b5f14f905c
Sync with Tramp 2.0.53.

diff -r 80049d479c75 -r def3f4aee280 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 17 12:05:40 2006 +0000
+++ b/lisp/ChangeLog	Mon Apr 17 12:56:56 2006 +0000
@@ -1,3 +1,22 @@
+2006-04-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.0.53.
+
+	* net/tramp.el (tramp-completion-mode): ?\t has event-modifier
+	'control.  Reported by Matthias Förste
+	<slashdevslashnull@gmx.net>.
+	(tramp-completion-file-name-handler): Add autoload cookie for
+	adding to `file-name-handler-alist'.
+
+	* net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for
+	the prompt.  If it returns earlier (when detecting an error
+	message), the rest of the output will merge accidently with the
+	output of the next command.  Reported by M Jared Finder
+	<jared@hpalace.com>.
+
+	* net/tramp-vc.el (vc-user-login-name): Wrap defadvice with a test
+	for `process-file', in order to let it work for older Emacsen too.
+
 2006-04-17  Ralf Angeli  <angeli@iwi.uni-sb.de>
 
 	* textmodes/tex-mode.el (tex-font-lock-match-suscript): New function.
@@ -2933,7 +2952,7 @@
 	(vc-default-update-changelog): Don't use vc-user-login-name, we
 	don't need it here.
 
-	* tramp-vc.el (vc-user-login-name): Comment out defadvice, it is
+	* net/tramp-vc.el (vc-user-login-name): Comment out defadvice, it is
 	no longer necessary.
 
 2006-01-25  Kenichi Handa  <handa@m17n.org>
diff -r 80049d479c75 -r def3f4aee280 lisp/net/tramp-smb.el
--- a/lisp/net/tramp-smb.el	Mon Apr 17 12:05:40 2006 +0000
+++ b/lisp/net/tramp-smb.el	Mon Apr 17 12:56:56 2006 +0000
@@ -979,7 +979,7 @@
     ;; Algorithm: get waiting output.  See if last line contains
     ;; tramp-smb-prompt sentinel or tramp-smb-errors strings.
     ;; If not, wait a bit and again get waiting output.
-    (while (and (not found) (not err))
+    (while (not found)
 
       ;; Accept pending output.
       (tramp-accept-process-output proc)
diff -r 80049d479c75 -r def3f4aee280 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Mon Apr 17 12:05:40 2006 +0000
+++ b/lisp/net/tramp.el	Mon Apr 17 12:56:56 2006 +0000
@@ -4344,6 +4344,7 @@
 ;;;###autoload
 (add-to-list 'file-name-handler-alist
 	     (cons tramp-file-name-regexp 'tramp-file-name-handler))
+;;;###autoload
 (add-to-list 'file-name-handler-alist
 	     (cons tramp-completion-file-name-regexp
 		   'tramp-completion-file-name-handler))
@@ -4458,24 +4459,28 @@
      file)
     (member (match-string 1 file) (mapcar 'car tramp-methods)))
    ((or (equal last-input-event 'tab)
-	;; Emacs
-	(and (integerp last-input-event)
-	     (not (event-modifiers last-input-event))
-	     (or (char-equal last-input-event ?\?)
-		 (char-equal last-input-event ?\t) ; handled by 'tab already?
-		 (char-equal last-input-event ?\ )))
+  	;; Emacs
+  	(and (integerp last-input-event)
+	     (or
+	      ;; ?\t has event-modifier 'control
+	      (char-equal last-input-event ?\t)
+	      (and (not (event-modifiers last-input-event))
+		   (or (char-equal last-input-event ?\?)
+		       (char-equal last-input-event ?\ )))))
 	;; XEmacs
 	(and (featurep 'xemacs)
-	     (not (event-modifiers last-input-event))
-	     (or (char-equal
-		  (funcall (symbol-function 'event-to-character)
-			   last-input-event) ?\?)
-		 (char-equal
-		  (funcall (symbol-function 'event-to-character)
-			   last-input-event) ?\t)
-		 (char-equal
-		  (funcall (symbol-function 'event-to-character)
-			   last-input-event) ?\ ))))
+	     (or
+	      ;; ?\t has event-modifier 'control
+	      (char-equal
+	       (funcall (symbol-function 'event-to-character)
+			last-input-event) ?\t)
+	      (and (not (event-modifiers last-input-event))
+		   (or (char-equal
+			(funcall (symbol-function 'event-to-character)
+				 last-input-event) ?\?)
+		       (char-equal
+			(funcall (symbol-function 'event-to-character)
+				 last-input-event) ?\ ))))))
     t)))
 
 (defun tramp-completion-handle-file-exists-p (filename)
diff -r 80049d479c75 -r def3f4aee280 lisp/net/trampver.el
--- a/lisp/net/trampver.el	Mon Apr 17 12:05:40 2006 +0000
+++ b/lisp/net/trampver.el	Mon Apr 17 12:56:56 2006 +0000
@@ -30,7 +30,7 @@
 ;; are auto-frobbed from configure.ac, so you should edit that file and run
 ;; "autoconf && ./configure" to change them.
 
-(defconst tramp-version "2.0.52"
+(defconst tramp-version "2.0.53"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
diff -r 80049d479c75 -r def3f4aee280 man/ChangeLog
--- a/man/ChangeLog	Mon Apr 17 12:05:40 2006 +0000
+++ b/man/ChangeLog	Mon Apr 17 12:56:56 2006 +0000
@@ -1,3 +1,7 @@
+2006-04-17  Michael Albinus  <michael.albinus@gmx.de>
+
+	Sync with Tramp 2.0.53.
+
 2006-04-13  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.texi: (Updating settings): New section.
diff -r 80049d479c75 -r def3f4aee280 man/trampver.texi
--- a/man/trampver.texi	Mon Apr 17 12:05:40 2006 +0000
+++ b/man/trampver.texi	Mon Apr 17 12:56:56 2006 +0000
@@ -4,7 +4,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.0.52
+@set trampver 2.0.53
 
 @c Other flags from configuration
 @set prefix /usr/local