* net/tramp.el (tramp-action-password, tramp-process-actions):

Revert patch from 2010-12-08.  Use `save-restriction'.

lisp/ChangeLog

+2010-12-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-action-password, tramp-process-actions):
+	Revert patch from 2010-12-08.  Use `save-restriction'.
+
 2010-12-09  Eli Zaretskii  <eliz@gnu.org>
 
 	* menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p):

lisp/net/tramp.el

@@ -6712,10 +6712,9 @@ file exists and nonzero exit status otherwise."
   (with-current-buffer (process-buffer proc)
     (tramp-check-for-regexp proc tramp-password-prompt-regexp)
     (tramp-message vec 3 "Sending %s" (match-string 1))
-    (tramp-message vec 6 "\n%s" (buffer-string)))
     (tramp-enter-password proc)
-    ;; Remove password prompt, in order not to find it next iteration.
-    (delete-region (point-min) (point-max)))
+    ;; Hide password prompt.
+    (narrow-to-region (point-max) (point-max))))
 
 (defun tramp-action-succeed (proc vec)
   "Signal success in finding shell prompt."
@@ -6816,6 +6815,7 @@ The terminal type can be configured with `tramp-terminal-type'."
   (with-temp-message ""
     ;; Enable auth-source and password-cache.
     (tramp-set-connection-property vec "first-password-request" t)
+    (save-restriction
       (let (exit)
 	(while (not exit)
 	  (tramp-message proc 3 "Waiting for prompts from remote shell")
@@ -6826,6 +6826,7 @@ The terminal type can be configured with `tramp-terminal-type'."
 			(tramp-process-one-action proc vec actions))
 		    (tramp-process-one-action proc vec actions)))))
 	(with-current-buffer (tramp-get-connection-buffer vec)
+	  (widen)
 	  (tramp-message vec 6 "\n%s" (buffer-string)))
 	(unless (eq exit 'ok)
 	  (tramp-clear-passwd vec)
@@ -6834,7 +6835,7 @@ The terminal type can be configured with `tramp-terminal-type'."
 	   (cond
 	    ((eq exit 'permission-denied) "Permission denied")
 	    ((eq exit 'process-died) "Process died")
-	  (t "Login failed")))))))
+	    (t "Login failed"))))))))
 
 ;; Utility functions.