diff options
| author | Michael Albinus | 2017-07-05 17:03:42 +0200 |
|---|---|---|
| committer | Michael Albinus | 2017-07-05 17:03:42 +0200 |
| commit | 17efc48000b8cb46c795742b40799ba1bb2019bc (patch) | |
| tree | 04337ca29bbbd2351b05788e1eb9ffa92c757f70 /lisp/net | |
| parent | 66dd3dc0eae6944630a467d658adacc6e5976f4e (diff) | |
| download | emacs-17efc48000b8cb46c795742b40799ba1bb2019bc.tar.gz emacs-17efc48000b8cb46c795742b40799ba1bb2019bc.zip | |
Suppress timers in Tramp
* lisp/net/tramp.el (tramp-file-name-handler): Don't trigger timers.
* test/lisp/net/tramp-tests.el
(tramp-test36-asynchronous-requests): Trigger timers.
(tramp-test37-recursive-load, tramp-test38-remote-load-path):
Set `default-directory' to a trustworthy value.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 9c327c410a7..945f81188c8 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -2128,9 +2128,7 @@ Falls back to normal file name handler if no Tramp file name handler exists." | |||
| 2128 | (unwind-protect | 2128 | (unwind-protect |
| 2129 | (let ((tramp-locker t)) | 2129 | (let ((tramp-locker t)) |
| 2130 | (apply foreign operation args)) | 2130 | (apply foreign operation args)) |
| 2131 | ;; Give timers a chance. | 2131 | (setq tramp-locked tl)))))) |
| 2132 | (unless (setq tramp-locked tl) | ||
| 2133 | (sit-for 0.001 'nodisp))))))) | ||
| 2134 | (cond | 2132 | (cond |
| 2135 | ((eq result 'non-essential) | 2133 | ((eq result 'non-essential) |
| 2136 | (tramp-message | 2134 | (tramp-message |