[Emacs-diffs] /srv/bzr/emacs/trunk r112484: * lisp/emacs-lisp/trace.el (trace--display-buffer): New function.

[Stefan Monnier]

------------------------------------------------------------
revno: 112484
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-05-06 18:33:24 -0400
message:
  * lisp/emacs-lisp/trace.el (trace--display-buffer): New function.
  (trace-make-advice): Use it.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/trace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-06 20:23:40 +0000
+++ b/lisp/ChangeLog    2013-05-06 22:33:24 +0000
@@ -1,3 +1,8 @@
+2013-05-06  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/trace.el (trace--display-buffer): New function.
+       (trace-make-advice): Use it.
+
 2013-05-06  Juri Linkov  <address@hidden>
 
        * emacs-lisp/lisp-mode.el (eval-defun-2): Doc fix.  (Bug#14344)

=== modified file 'lisp/emacs-lisp/trace.el'
--- a/lisp/emacs-lisp/trace.el  2013-04-14 01:02:29 +0000
+++ b/lisp/emacs-lisp/trace.el  2013-05-06 22:33:24 +0000
@@ -200,6 +200,18 @@
 
 (defvar trace--timer nil)
 
+(defun trace--display-buffer (buf)
+  (unless (or trace--timer
+             (get-buffer-window buf 'visible))
+    (setq trace--timer
+         ;; Postpone the display to some later time, in case we
+         ;; can't actually do it now.
+         (run-with-timer 0 nil
+                         (lambda ()
+                           (setq trace--timer nil)
+                           (display-buffer buf nil 0))))))
+
+
 (defun trace-make-advice (function buffer background context)
   "Build the piece of advice to be added to trace FUNCTION.
 FUNCTION is the name of the traced function.
@@ -214,15 +226,7 @@
       (unless inhibit-trace
         (with-current-buffer trace-buffer
           (set (make-local-variable 'window-point-insertion-type) t)
-          (unless (or background trace--timer
-                      (get-buffer-window trace-buffer 'visible))
-            (setq trace--timer
-                  ;; Postpone the display to some later time, in case we
-                  ;; can't actually do it now.
-                  (run-with-timer 0 nil
-                                  (lambda ()
-                                    (setq trace--timer nil)
-                                    (display-buffer trace-buffer)))))
+          (unless background (trace--display-buffer trace-buffer))
           (goto-char (point-max))
           ;; Insert a separator from previous trace output:
           (if (= trace-level 1) (insert trace-separator))
@@ -235,7 +239,7 @@
           (unless inhibit-trace
             (let ((ctx (funcall context)))
               (with-current-buffer trace-buffer
-                (unless background (display-buffer trace-buffer))
+                (unless background (trace--display-buffer trace-buffer))
                 (goto-char (point-max))
                 (insert
                  (trace-exit-message