Add 2008 to copyright years.

[gnu-emacs] / lisp / net / tramp-gw.el

diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el
index 78f8040a90941b002f8824af6880f772a9c492e5..498112c66b145d82290091eb56393784119fb892 100644 (file)
--- a/lisp/net/tramp-gw.el
+++ b/lisp/net/tramp-gw.el
@@ -1,7 +1,6 @@
-;;; -*- coding: iso-8859-1; -*-
 ;;; tramp-gw.el --- Tramp utility functions for HTTP tunnels and SOCKS gateways
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -10,8 +9,8 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -285,12 +284,11 @@ PROXY is an indication whether we need a Proxy-Authorization header
 or an Authorization header.  If PW-CACHE is non-nil, check for
 password in password cache.  This is done for the first try only."
 
-  ;; `tramp-current-*' must be set for `tramp-read-passwd' and
-  ;; `tramp-clear-passwd'.
+  ;; `tramp-current-*' must be set for `tramp-read-passwd'.
   (let ((tramp-current-method (tramp-file-name-method tramp-gw-gw-vector))
        (tramp-current-user (tramp-file-name-user tramp-gw-gw-vector))
        (tramp-current-host (tramp-file-name-host tramp-gw-gw-vector)))
-    (unless pw-cache (tramp-clear-passwd))
+    (unless pw-cache (tramp-clear-passwd tramp-gw-gw-vector))
     ;; We are already in the right buffer.
     (tramp-message
      tramp-gw-vector 5 "%s required"
@@ -308,7 +306,7 @@ password in password cache.  This is done for the first try only."
        "%s:%s"
        socks-username
        (tramp-read-passwd
-       proc
+       nil
        (format
         "Password for %s@[%s]: " socks-username (read (current-buffer)))))))))