# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1295364804 -3600
# Node ID 49f47421e4c119c3350ebfa0a7f715a1f5cb0583
# Parent  c29a17e02c5b9a36a8c500fb565fd8000abd9053
* net/tramp.el (tramp-debug-message): Extend function exclude
list.  Use `regexp-opt'.

diff -r c29a17e02c5b -r 49f47421e4c1 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 18 16:30:51 2011 +0100
+++ b/lisp/ChangeLog	Tue Jan 18 16:33:24 2011 +0100
@@ -1,3 +1,8 @@
+2011-01-18  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-debug-message): Extend function exclude
+	list.  Use `regexp-opt'.
+
 2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/tex-mode.el (tex-font-lock-verb): Make sure \verb
diff -r c29a17e02c5b -r 49f47421e4c1 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Tue Jan 18 16:30:51 2011 +0100
+++ b/lisp/net/tramp.el	Tue Jan 18 16:33:24 2011 +0100
@@ -1293,7 +1293,8 @@
       (let ((now (current-time)))
         (insert (format-time-string "%T." now))
         (insert (format "%06d " (nth 2 now))))
-      ;; Calling function.
+      ;; Calling Tramp function.  We suppress compat and trace
+      ;; functions from being displayed.
       (let ((btn 1) btf fn)
 	(while (not fn)
 	  (setq btf (nth 1 (backtrace-frame btn)))
@@ -1301,10 +1302,23 @@
 	      (setq fn "")
 	    (when (symbolp btf)
 	      (setq fn (symbol-name btf))
-	      (unless (and (string-match "^tramp" fn)
-			   (not (string-match
-				 "^tramp\\(-debug\\)?\\(-message\\|-error\\|-compat\\(-funcall\\|-with-temp-message\\)\\)$"
-				 fn)))
+	      (unless
+		  (and
+		   (string-match "^tramp" fn)
+		   (not
+		    (string-match
+		     (concat
+		      "^"
+		      (regexp-opt
+		       '("tramp-compat-funcall"
+			 "tramp-compat-with-temp-message"
+			 "tramp-debug-message"
+			 "tramp-error"
+			 "tramp-error-with-buffer"
+			 "tramp-message")
+		       t)
+		      "$")
+		     fn)))
 		(setq fn nil)))
 	    (setq btn (1+ btn))))
 	;; The following code inserts filename and line number.