[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100562: * net/tramp.el (tramp-pro
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100562: * net/tramp.el (tramp-process-actions): Add POS argument. Delete |
Date: |
Mon, 25 Apr 2011 19:58:27 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 100562
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-04-25 19:58:27 +0200
message:
* net/tramp.el (tramp-process-actions): Add POS argument. Delete
region between POS and (pos).
(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.
modified:
lisp/ChangeLog
lisp/net/tramp-smb.el
lisp/net/tramp.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-04-25 00:20:47 +0000
+++ b/lisp/ChangeLog 2011-04-25 17:58:27 +0000
@@ -1,3 +1,14 @@
+2011-04-25 Michael Albinus <address@hidden>
+
+ * net/tramp.el (tramp-process-actions): Add POS argument. Delete
+ region between POS and (pos).
+ (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.
+
2011-04-24 Daniel Colascione <address@hidden>
* progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
=== modified file 'lisp/net/tramp-smb.el'
--- a/lisp/net/tramp-smb.el 2011-01-02 23:50:46 +0000
+++ b/lisp/net/tramp-smb.el 2011-04-25 17:58:27 +0000
@@ -1,7 +1,7 @@
;;; tramp-smb.el --- Tramp access functions for SMB servers
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+;; 2011 Free Software Foundation, Inc.
;; Author: Michael Albinus <address@hidden>
;; Keywords: comm, processes
@@ -1328,7 +1328,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 13:26:19 +0000
+++ b/lisp/net/tramp.el 2011-04-25 17:58:27 +0000
@@ -4098,7 +4098,8 @@
(tramp-message
v 6 "%s" (mapconcat 'identity (process-command p) " "))
(tramp-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-set-connection-property v "process-name" nil)
@@ -6821,8 +6822,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'.
(with-temp-message ""
;; Enable auth-source and password-cache.
@@ -6847,7 +6851,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.
@@ -7523,7 +7530,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
@@ -7677,7 +7685,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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100562: * net/tramp.el (tramp-process-actions): Add POS argument. Delete,
Michael Albinus <=