Mercurial > emacs
changeset 112358:49f47421e4c1
* net/tramp.el (tramp-debug-message): Extend function exclude
list. Use `regexp-opt'.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Tue, 18 Jan 2011 16:33:24 +0100 |
| parents | c29a17e02c5b |
| children | 011b1eb5c384 |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 24 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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.