aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/net/tramp.el3
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."
4124(defun tramp-time-diff (t1 t2) 4124(defun tramp-time-diff (t1 t2)
4125 "Return the difference between the two times, in seconds. 4125 "Return the difference between the two times, in seconds.
4126T1 and T2 are time values (as returned by `current-time' for example)." 4126T1 and T2 are time values (as returned by `current-time' for example)."
4127 (float-time (time-subtract t1 t2))) 4127 ;; Starting with Emacs 25.1, we could change this to use `time-subtract'.
4128 (float-time (subtract-time t1 t2)))
4128 4129
4129;; Currently (as of Emacs 20.5), the function `shell-quote-argument' 4130;; Currently (as of Emacs 20.5), the function `shell-quote-argument'
4130;; does not deal well with newline characters. Newline is replaced by 4131;; does not deal well with newline characters. Newline is replaced by