[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 001d59c 1/2: Revert e2f785991d0c696fbb2bc2f331f888d
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 001d59c 1/2: Revert e2f785991d0c696fbb2bc2f331f888d979b8da82 for tramp.el |
Date: |
Mon, 9 May 2016 07:20:53 +0000 (UTC) |
branch: master
commit 001d59c60465d30abec6575a767c6daa16f2f8db
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Revert e2f785991d0c696fbb2bc2f331f888d979b8da82 for tramp.el
* lisp/net/tramp.el (tramp-time-diff): Revert previous change due to
backwards
compatibility.
---
lisp/net/tramp.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 377b529..b179815 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