diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-05-09 09:18:50 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-05-09 09:18:50 +0200 |
| commit | 001d59c60465d30abec6575a767c6daa16f2f8db (patch) | |
| tree | 48b145295c8fe2cba28a2f727f6021214267efbe /lisp/net/tramp.el | |
| parent | 80bea210ff14a64daa1d71765983aa3baa149555 (diff) | |
| download | emacs-001d59c60465d30abec6575a767c6daa16f2f8db.tar.gz emacs-001d59c60465d30abec6575a767c6daa16f2f8db.tar.bz2 emacs-001d59c60465d30abec6575a767c6daa16f2f8db.zip | |
Revert e2f785991d0c696fbb2bc2f331f888d979b8da82 for tramp.el
* lisp/net/tramp.el (tramp-time-diff): Revert previous change due to backwards
compatibility.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 377b529803c..b179815af32 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4124,7 +4124,8 @@ Invokes `password-read' if available, `read-passwd' else." (defun tramp-time-diff (t1 t2) "Return the difference between the two times, in seconds. T1 and T2 are time values (as returned by `current-time' for example)." - (float-time (time-subtract t1 t2))) + ;; Starting with Emacs 25.1, we could change this to use `time-subtract'. + (float-time (subtract-time t1 t2))) ;; Currently (as of Emacs 20.5), the function `shell-quote-argument' ;; does not deal well with newline characters. Newline is replaced by |