procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert e2f785991d for tramp.el

Browse source 
* lisp/net/tramp.el (tramp-time-diff): Revert previous change due to backwards
compatibility.
This commit is contained in:
Michael Albinus 2016-05-09 09:18:50 +02:00
parent 80bea210ff
commit 001d59c604
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/net/tramp.el
View file

@ -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