[Emacs-diffs] /srv/bzr/emacs/trunk r102893: * net/tramp.el (tramp-debug-message): Extend function exclude

[Michael Albinus]

------------------------------------------------------------
revno: 102893
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2011-01-18 16:33:24 +0100
message:
  * net/tramp.el (tramp-debug-message): Extend function exclude
  list.  Use `regexp-opt'.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-18 04:07:36 +0000
+++ b/lisp/ChangeLog    2011-01-18 15:33:24 +0000
@@ -1,3 +1,8 @@
+2011-01-18  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-debug-message): Extend function exclude
+       list.  Use `regexp-opt'.
+
 2011-01-18  Stefan Monnier  <address@hidden>
 
        * textmodes/tex-mode.el (tex-font-lock-verb): Make sure \verb

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2011-01-15 20:38:27 +0000
+++ b/lisp/net/tramp.el 2011-01-18 15:33:24 +0000
@@ -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.