[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/tramp-thread-safe 43cac37 2/2: * lisp/net/tramp.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] feature/tramp-thread-safe 43cac37 2/2: * lisp/net/tramp.el (tramp-debug-message): |
Date: |
Thu, 9 Aug 2018 09:56:13 -0400 (EDT) |
branch: feature/tramp-thread-safe
commit 43cac37e0841a427138f768fd886e4fad8d4c1c2
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
* lisp/net/tramp.el (tramp-debug-message):
`tramp-compat-main-thread' could be nil.
---
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 a8a927a..5429cdf 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1587,7 +1587,8 @@ ARGUMENTS to actually emit the message (if applicable)."
(insert (format-time-string "%T." now))
(insert (format "%06d " (nth 2 now))))
;; Threads.
- (unless (eq (tramp-compat-current-thread) tramp-compat-main-thread)
+ (unless (or (null tramp-compat-main-thread)
+ (eq (tramp-compat-current-thread) tramp-compat-main-thread))
(insert (format "%s " (tramp-compat-current-thread))))
;; Calling Tramp function. We suppress compat and trace functions
;; from being displayed.