Mercurial > emacs
changeset 109474:0366d395e7e6
* 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'.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Tue, 20 Jul 2010 12:29:05 +0200 |
| parents | f7b2644b5eee |
| children | 692d2ce789dc |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jul 20 01:20:05 2010 +0000 +++ b/lisp/ChangeLog Tue Jul 20 12:29:05 2010 +0200 @@ -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'.
--- a/lisp/net/tramp.el Tue Jul 20 01:20:05 2010 +0000 +++ b/lisp/net/tramp.el Tue Jul 20 12:29:05 2010 +0200 @@ -1787,7 +1787,7 @@ $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 @@ $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 @@ ;; 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 @@ ;; 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.