From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 20 Jul 2010 10:29:05 +0000 (+0200)
Subject: * net/tramp.el (tramp-perl-file-attributes)
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da040a16153051de6359361bcc9727f97782b350;p=emacs.git

* net/tramp.el (tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes): Don't pass "$3".
(tramp-maybe-open-connection): Use `async-args' and `gw-args' in
front of `login-args'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2729668cea5..ecafde3d9bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-perl-file-attributes)
+	(tramp-perl-directory-files-and-attributes): Don't pass "$3".
+	(tramp-maybe-open-connection): Use `async-args' and `gw-args' in
+	front of `login-args'.
+
 2010-07-19  Juanma Barranquero  <lekktu@gmail.com>
 
 	* time.el (display-time-world-mode): Define with `define-derived-mode'.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 4bda4bc0cd3..e6c59ee448c 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1787,7 +1787,7 @@ printf(
     $stat[2],
     $stat[1] >> 16 & 0xffff,
     $stat[1] & 0xffff
-);' \"$1\" \"$2\" \"$3\" 2>/dev/null"
+);' \"$1\" \"$2\" 2>/dev/null"
   "Perl script to produce output suitable for use with `file-attributes'
 on the remote file system.
 Escape sequence %s is replaced with name of Perl binary.
@@ -1840,7 +1840,7 @@ for($i = 0; $i < $n; $i++)
         $stat[0] >> 16 & 0xffff,
         $stat[0] & 0xffff);
 }
-printf(\")\\n\");' \"$1\" \"$2\" \"$3\" 2>/dev/null"
+printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null"
   "Perl script implementing `directory-files-attributes' as Lisp `read'able
 output.
 Escape sequence %s is replaced with name of Perl binary.
@@ -7533,11 +7533,11 @@ connection if a previous connection has died for some reason."
 
 		;; Add arguments for asynchrononous processes.
 		(when (and process-name async-args)
-		  (setq login-args (append login-args async-args)))
+		  (setq login-args (append async-args login-args)))
 
 		;; Add gateway arguments if necessary.
 		(when (and gw gw-args)
-		  (setq login-args (append login-args gw-args)))
+		  (setq login-args (append gw-args login-args)))
 
 		;; Check for port number.  Until now, there's no need
 		;; for handling like method, user, host.
@@ -8858,7 +8858,6 @@ Only works for Bourne-like shells."
 ;;   by the files in that directory.  Add this here.
 ;; * Avoid screen blanking when hitting `g' in dired.  (Eli Tziperman)
 ;; * Make ffap.el grok Tramp filenames.  (Eli Tziperman)
-;; * Case-insensitive filename completion.  (Norbert Goevert.)
 ;; * Don't use globbing for directories with many files, as this is
 ;;   likely to produce long command lines, and some shells choke on
 ;;   long command lines.