# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1208574631 0
# Node ID d55e28c98546eb4b570c63a714910dc3979d7c5a
# Parent  e6520392993018cca1165ca5adf0c7ae7f718d5a
(trace-make-advice): Don't change selected-window.

diff -r e65203929930 -r d55e28c98546 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 19 03:09:47 2008 +0000
+++ b/lisp/ChangeLog	Sat Apr 19 03:10:31 2008 +0000
@@ -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 -r e65203929930 -r d55e28c98546 lisp/emacs-lisp/trace.el
--- a/lisp/emacs-lisp/trace.el	Sat Apr 19 03:09:47 2008 +0000
+++ b/lisp/emacs-lisp/trace.el	Sat Apr 19 03:10:31 2008 +0000
@@ -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