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'.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index ab1b4d354f79b5d349579fb4ef9035f86b78120b..99c93eaa5731d0337ebb444e8139808911e61581 100644 (file)
--- 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."