master 65fb048: Finish last Tramp patch

[Michael Albinus]

branch: master
commit 65fb04801c59ac204790e0a5c0599c9b11151f32
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Finish last Tramp patch
    
    * lisp/net/tramp.el (outline-regexp): Remove declaration.
    (tramp-debug-outline-regexp): Add thread regexp.
    (tramp-debug-font-lock-keywords): New defconst.
    (tramp-debug-outline-level): Adapt to changed
    `tramp-debug-outline-regexp'.
    (tramp-get-debug-buffer): Use `tramp-debug-font-lock-keywords'.
---
 lisp/net/tramp.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index ab1b4d3..99c93ea 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1648,7 +1648,11 @@ version, the function does nothing."
       (format "*debug tramp/%s %s*" method host-port))))
 
 (defconst tramp-debug-outline-regexp
-  "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ [a-z0-9-]+ (\\([0-9]+\\)) #"
+  (eval-when-compile
+    (concat
+     "[0-9]+:[0-9]+:[0-9]+\\.[0-9]+ " ;; Timestamp.
+     "\\(?:\\(#<thread .+>\\) \\)?"   ;; Thread.
+     "[a-z0-9-]+ (\\([0-9]+\\)) #"))  ;; Function name, verbosity.
   "Used for highlighting Tramp debug buffers in `outline-mode'.")
 
 (defconst tramp-debug-font-lock-keywords
@@ -1663,7 +1667,7 @@ version, the function does nothing."
 Point must be at the beginning of a header line.
 
 The outline level is equal to the verbosity of the Tramp message."
-  (1+ (string-to-number (match-string 1))))
+  (1+ (string-to-number (match-string 2))))
 
 (defun tramp-get-debug-buffer (vec)
   "Get the debug buffer for VEC."