From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 9 Aug 2018 13:55:54 +0000 (+0200)
Subject: * lisp/net/tramp.el (tramp-debug-message):
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43cac37e0841a427138f768fd886e4fad8d4c1c2;p=emacs.git

* lisp/net/tramp.el (tramp-debug-message):

`tramp-compat-main-thread' could be nil.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a8a927aea06..5429cdf7fec 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.