Revert e2f785991d0c696fbb2bc2f331f888d979b8da82 for tramp.el

* lisp/net/tramp.el (tramp-time-diff): Revert previous change due to backwards
compatibility.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 377b529803c420bc119fb3a1b85b05b387e86d23..b179815af3292010976c2b7f3b361346aa25ceba 100644 (file)
--- 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