aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-10-19 11:50:07 +0200
committerMichael Albinus2010-10-19 11:50:07 +0200
commit3224b54d5cc5964af5e6509579fd942eae04f1d1 (patch)
tree789b2e9a4cc8c9bb8682d7498bec1fbaa12678d3
parent2fe10446ee03d05506af9e787b56f4c2ca4ee956 (diff)
downloademacs-3224b54d5cc5964af5e6509579fd942eae04f1d1.tar.gz
emacs-3224b54d5cc5964af5e6509579fd942eae04f1d1.zip
* net/tramp-sh.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/ChangeLog10
-rw-r--r--lisp/net/tramp-sh.el4
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 949e7d40e3d..ed11b1c19b1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12010-10-19 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.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
12010-10-18 Julien Danjou <julien@danjou.info> 82010-10-18 Julien Danjou <julien@danjou.info>
2 9
3 * avoid.el (mouse-avoidance-ignore-p): Ignore mouse when it is 10 * avoid.el (mouse-avoidance-ignore-p): Ignore mouse when it is
@@ -95,7 +102,8 @@
952010-10-15 Michael Albinus <michael.albinus@gmx.de> 1022010-10-15 Michael Albinus <michael.albinus@gmx.de>
96 103
97 * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): 104 * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
98 Suppress expansion of tabs to spaces. 105 Suppress expansion of tabs to spaces. Reported by Dale Sedivec
106 <dale@codefu.org>.
99 107
1002010-10-14 Kenichi Handa <handa@m17n.org> 1082010-10-14 Kenichi Handa <handa@m17n.org>
101 109
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 474c39adeed..1f13f50a240 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1241,7 +1241,7 @@ target of the symlink differ."
1241 (format 1241 (format
1242 ;; On Opsware, pdksh (which is the true name of ksh there) doesn't 1242 ;; On Opsware, pdksh (which is the true name of ksh there) doesn't
1243 ;; parse correctly the sequence "((". Therefore, we add a space. 1243 ;; parse correctly the sequence "((". Therefore, we add a space.
1244 "( (%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)" 1244 "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' %s || echo nil)"
1245 (tramp-get-file-exists-command vec) 1245 (tramp-get-file-exists-command vec)
1246 (tramp-shell-quote-argument localname) 1246 (tramp-shell-quote-argument localname)
1247 (tramp-get-test-command vec) 1247 (tramp-get-test-command vec)
@@ -1629,7 +1629,7 @@ and gid of the corresponding user is taken. Both parameters must be integers."
1629 ;; but it does not work on all remote systems. Therefore, we 1629 ;; but it does not work on all remote systems. Therefore, we
1630 ;; quote the filenames via sed. 1630 ;; quote the filenames via sed.
1631 "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs " 1631 "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs "
1632 "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); " 1632 "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)'); "
1633 "echo \")\"") 1633 "echo \")\"")
1634 (tramp-shell-quote-argument localname) 1634 (tramp-shell-quote-argument localname)
1635 (tramp-get-ls-command vec) 1635 (tramp-get-ls-command vec)