diff options
| author | Michael Albinus | 2013-02-21 14:36:16 +0100 |
|---|---|---|
| committer | Michael Albinus | 2013-02-21 14:36:16 +0100 |
| commit | 886bae77f01a92cb2f40425197e48ea40582c1be (patch) | |
| tree | e77329644d9024c739b28c3289145d4c4dbf9212 | |
| parent | 5313bbc7716f88453d329a39181e6e583ebcc41f (diff) | |
| download | emacs-886bae77f01a92cb2f40425197e48ea40582c1be.tar.gz emacs-886bae77f01a92cb2f40425197e48ea40582c1be.zip | |
* net/tramp-sh.el (tramp-sh-handle-set-file-times): Set $UTC only
temporarily, via "env".
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15dd5d30654..9ecf7ebddd7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-02-21 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-sh-handle-set-file-times): Set $UTC only | ||
| 4 | temporarily, via "env". | ||
| 5 | |||
| 1 | 2013-02-21 Glenn Morris <rgm@gnu.org> | 6 | 2013-02-21 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * info.el (Info-enable-edit): Remove. | 8 | * info.el (Info-enable-edit): Remove. |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 7388c570874..82cbda57086 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -1410,7 +1410,7 @@ of." | |||
| 1410 | (utc (not (featurep 'xemacs)))) | 1410 | (utc (not (featurep 'xemacs)))) |
| 1411 | (tramp-send-command-and-check | 1411 | (tramp-send-command-and-check |
| 1412 | v (format "%s touch -t %s %s" | 1412 | v (format "%s touch -t %s %s" |
| 1413 | (if utc "TZ=UTC; export TZ;" "") | 1413 | (if utc "env TZ=UTC" "") |
| 1414 | (if utc | 1414 | (if utc |
| 1415 | (format-time-string "%Y%m%d%H%M.%S" time t) | 1415 | (format-time-string "%Y%m%d%H%M.%S" time t) |
| 1416 | (format-time-string "%Y%m%d%H%M.%S" time)) | 1416 | (format-time-string "%Y%m%d%H%M.%S" time)) |