2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1036bf477f7..133c02fac96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/trace.el (trace-make-advice): Don't change selected-window.
+
 2008-04-18  Sam Steingold  <sds@gnu.org>
 
         * vc.el (vc-dir-menu-map, vc-dir-mode-map, vc-dir-tool-bar-map):
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 4edb496db41..d007addbeb8 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -220,7 +220,7 @@
            (trace-buffer (get-buffer-create ,buffer)))
        (unless inhibit-trace
          (with-current-buffer trace-buffer
-           ,(unless background '(pop-to-buffer trace-buffer))
+           ,(unless background '(display-buffer trace-buffer))
            (goto-char (point-max))
            ;; Insert a separator from previous trace output:
            (if (= trace-level 1) (insert trace-separator))
@@ -230,7 +230,7 @@
        ad-do-it
        (unless inhibit-trace
          (with-current-buffer trace-buffer
-           ,(unless background '(pop-to-buffer trace-buffer))
+           ,(unless background '(display-buffer trace-buffer))
            (goto-char (point-max))
            (insert
             (trace-exit-message