[Emacs-diffs] /srv/bzr/emacs/trunk r104008: * net/tramp.el (tramp-process-actions): Add POS argument. Delete

[Michael Albinus]

------------------------------------------------------------
revno: 104008
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2011-04-25 20:10:17 +0200
message:
  * net/tramp.el (tramp-process-actions): Add POS argument.  Delete
  region between POS and (pos).
  
  * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use
  `nil' position in `tramp-process-actions' call.
  (tramp-maybe-open-connection): Call `tramp-process-actions' with pos.
  
  * net/tramp-smb.el (tramp-smb-maybe-open-connection): Use `nil'
  position in `tramp-process-actions' call.
  
  * net/trampver.el: Update release number.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el
  lisp/net/tramp-smb.el
  lisp/net/tramp.el
  lisp/net/trampver.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-25 16:52:51 +0000
+++ b/lisp/ChangeLog    2011-04-25 18:10:17 +0000
@@ -1,3 +1,17 @@
+2011-04-25  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-process-actions): Add POS argument.  Delete
+       region between POS and (pos).
+
+       * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use
+       `nil' position in `tramp-process-actions' call.
+       (tramp-maybe-open-connection): Call `tramp-process-actions' with pos.
+
+       * net/tramp-smb.el (tramp-smb-maybe-open-connection): Use `nil'
+       position in `tramp-process-actions' call.
+
+       * net/trampver.el: Update release number.
+
 2011-04-25  Stefan Monnier  <address@hidden>
 
        * custom.el (defcustom): Obey lexical-binding.

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2011-04-14 18:58:45 +0000
+++ b/lisp/net/tramp-sh.el      2011-04-25 18:10:17 +0000
@@ -2336,7 +2336,8 @@
                   orig-vec 6 "%s"
                   (mapconcat 'identity (process-command p) " "))
                  (tramp-compat-set-process-query-on-exit-flag p nil)
-                 (tramp-process-actions p v tramp-actions-copy-out-of-band)))
+                 (tramp-process-actions
+                  p v nil tramp-actions-copy-out-of-band)))
 
            ;; Reset the transfer process properties.
            (tramp-message orig-vec 6 "%s" (buffer-string))
@@ -4212,7 +4213,8 @@
   (catch 'uname-changed
     (let ((p (tramp-get-connection-process vec))
          (process-name (tramp-get-connection-property vec "process-name" nil))
-         (process-environment (copy-sequence process-environment)))
+         (process-environment (copy-sequence process-environment))
+         (pos (with-current-buffer (tramp-get-connection-buffer vec) (point))))
 
       ;; If too much time has passed since last command was sent, look
       ;; whether process is still alive.  If it isn't, kill it.  When
@@ -4366,7 +4368,7 @@
                ;; Send the command.
                (tramp-message vec 3 "Sending command `%s'" command)
                (tramp-send-command vec command t t)
-               (tramp-process-actions p vec tramp-actions-before-shell 60)
+               (tramp-process-actions p vec pos tramp-actions-before-shell 60)
                (tramp-message
                 vec 3 "Found remote shell prompt on `%s'" l-host))
              ;; Next hop.

=== modified file 'lisp/net/tramp-smb.el'
--- a/lisp/net/tramp-smb.el     2011-04-14 18:58:45 +0000
+++ b/lisp/net/tramp-smb.el     2011-04-25 18:10:17 +0000
@@ -1314,7 +1314,7 @@
 
              ;; Play login scenario.
              (tramp-process-actions
-              p vec
+              p vec nil
               (if share
                   tramp-smb-actions-with-share
                 tramp-smb-actions-without-share))

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2011-03-12 19:19:47 +0000
+++ b/lisp/net/tramp.el 2011-04-25 18:10:17 +0000
@@ -3098,8 +3098,11 @@
          (setq found (funcall action proc vec)))))
     found))
 
-(defun tramp-process-actions (proc vec actions &optional timeout)
-  "Perform actions until success or TIMEOUT."
+(defun tramp-process-actions (proc vec pos actions &optional timeout)
+  "Perform ACTIONS until success or TIMEOUT.
+PROC and VEC indicate the remote connection to be used.  POS, if
+set, is the starting point of the region to be deleted in the
+connection buffer."
   ;; Preserve message for `progress-reporter'.
   (tramp-compat-with-temp-message ""
     ;; Enable auth-source and password-cache.
@@ -3124,7 +3127,10 @@
           (cond
            ((eq exit 'permission-denied) "Permission denied")
            ((eq exit 'process-died) "Process died")
-           (t "Login failed"))))))))
+           (t "Login failed"))))
+       (when (numberp pos)
+         (with-current-buffer (tramp-get-connection-buffer vec)
+           (let (buffer-read-only) (delete-region pos (point)))))))))
 
 :;; Utility functions:
 

=== modified file 'lisp/net/trampver.el'
--- a/lisp/net/trampver.el      2011-03-12 19:19:47 +0000
+++ b/lisp/net/trampver.el      2011-04-25 18:10:17 +0000
@@ -31,7 +31,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.1"
+(defconst tramp-version "2.2.2-pre"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                      (= emacs-major-version 21)
                      (>= emacs-minor-version 4)))
             "ok"
-          (format "Tramp 2.2.1 is not fit for %s"
+          (format "Tramp 2.2.2-pre is not fit for %s"
                   (when (string-match "^.*$" (emacs-version))
                     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))