Sync with Tramp 2.0.53.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3cb1b00313227cec9239cc1060fc38ca1714a9e..7e29b0d951250d1eef5fdfdc75ce9513724aeeac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 04fbd3636f83576804d03926097e2c5e73a60497..34bb388f855d53c91f71ef309fd4f2502c894eab 100644 (file)
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -979,7 +979,7 @@ Returns nil if an error message has appeared."
     ;; 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 --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5abd3dd36e4ab42b5cb8c48bb813169614c77b13..9ea8514153e48d044fb38a48d25329dc605c1838 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4344,6 +4344,7 @@ Falls back to normal file name handler if no tramp file name handler exists."
 ;;;###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 @@ necessary anymore."
      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 --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index a71667291da31c75b733af7e01748bce07cfe173..c7edf9a4cdca8cc6b2f14554f7498a6c5e2af548 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index afb891b18b84af81bec455a9ac664581f40f45c8..b70a4243be6a02285ca826755b5f0f581dfbd438 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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 --git a/man/trampver.texi b/man/trampver.texi
index 625e3869c1113217e9b6e66eb0a86e219c72b9cc..4fc3958b2f22accb19628d75484ff825281361d6 100644 (file)
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -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