diff options
| author | Michael Albinus | 2010-10-19 11:26:21 +0200 |
|---|---|---|
| committer | Michael Albinus | 2010-10-19 11:26:21 +0200 |
| commit | bca0f839a56a1edd8562ada5962b809323f39efc (patch) | |
| tree | 06abcb689af69ecea638c15b9238db266a4a82a1 | |
| parent | e8b69dc2863ee79bef680cbd3837267f2481f005 (diff) | |
| download | emacs-bca0f839a56a1edd8562ada5962b809323f39efc.tar.gz emacs-bca0f839a56a1edd8562ada5962b809323f39efc.zip | |
* net/tramp.el (tramp-do-file-attributes-with-stat)
(tramp-do-directory-files-and-attributes-with-stat): Use "e0" in
order to make stat results a float. Patch by Andreas Schwab
<schwab@linux-m68k.org>.
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2f40d3565e0..4d04453791a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2010-10-19 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-do-file-attributes-with-stat) | ||
| 4 | (tramp-do-directory-files-and-attributes-with-stat): Use "e0" in | ||
| 5 | order to make stat results a float. Patch by Andreas Schwab | ||
| 6 | <schwab@linux-m68k.org>. | ||
| 7 | |||
| 1 | 2010-10-18 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2010-10-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 9 | ||
| 3 | * repeat.el (repeat): Use read-key (bug#6256). | 10 | * repeat.el (repeat): Use read-key (bug#6256). |
| @@ -15,7 +22,8 @@ | |||
| 15 | 2010-10-15 Michael Albinus <michael.albinus@gmx.de> | 22 | 2010-10-15 Michael Albinus <michael.albinus@gmx.de> |
| 16 | 23 | ||
| 17 | * net/tramp.el (tramp-open-connection-setup-interactive-shell): | 24 | * net/tramp.el (tramp-open-connection-setup-interactive-shell): |
| 18 | Suppress expansion of tabs to spaces. | 25 | Suppress expansion of tabs to spaces. Reported by Dale Sedivec |
| 26 | <dale@codefu.org>. | ||
| 19 | 27 | ||
| 20 | 2010-10-15 Kenichi Handa <handa@m17n.org> | 28 | 2010-10-15 Kenichi Handa <handa@m17n.org> |
| 21 | 29 | ||
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 01317ac3708..3ee5509276e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -2922,7 +2922,7 @@ target of the symlink differ." | |||
| 2922 | (format | 2922 | (format |
| 2923 | ;; On Opsware, pdksh (which is the true name of ksh there) doesn't | 2923 | ;; On Opsware, pdksh (which is the true name of ksh there) doesn't |
| 2924 | ;; parse correctly the sequence "((". Therefore, we add a space. | 2924 | ;; parse correctly the sequence "((". Therefore, we add a space. |
| 2925 | "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)" | 2925 | "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' %s || echo nil)" |
| 2926 | (tramp-get-file-exists-command vec) | 2926 | (tramp-get-file-exists-command vec) |
| 2927 | (tramp-shell-quote-argument localname) | 2927 | (tramp-shell-quote-argument localname) |
| 2928 | (tramp-get-test-command vec) | 2928 | (tramp-get-test-command vec) |
| @@ -3378,7 +3378,7 @@ value of `default-file-modes', without execute permissions." | |||
| 3378 | ;; but it does not work on all remote systems. Therefore, we | 3378 | ;; but it does not work on all remote systems. Therefore, we |
| 3379 | ;; quote the filenames via sed. | 3379 | ;; quote the filenames via sed. |
| 3380 | "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs " | 3380 | "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs " |
| 3381 | "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); " | 3381 | "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)'); " |
| 3382 | "echo \")\"") | 3382 | "echo \")\"") |
| 3383 | (tramp-shell-quote-argument localname) | 3383 | (tramp-shell-quote-argument localname) |
| 3384 | (tramp-get-ls-command vec) | 3384 | (tramp-get-ls-command vec) |