From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 11 Jul 2006 16:39:50 +0000 (+0000)
Subject: * progmodes/ebrowse.el (ebrowse-display-member-buffer): Avoid
X-Git-Tag: emacs-pretest-22.0.90~1547
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce4746a36acbc91144f038c96c75f07b4165f403;p=emacs.git

* progmodes/ebrowse.el (ebrowse-display-member-buffer): Avoid
	using with-output-to-temp-buffer, which clobbers local vars.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b15d8f1fb01..7bf32e705ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-11  Chong Yidong  <cyd@stupidchicken.com>
+
+	* progmodes/ebrowse.el (ebrowse-display-member-buffer): Avoid
+	using with-output-to-temp-buffer, which clobbers local vars.
+
 2006-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/compile.el (compilation-error-regexp-alist-alist):
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 3c328697a20..7a45dcd655e 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -2734,24 +2734,24 @@ means the member buffer is standalone.  CLASS is its class."
     ;; is on if not specified as an argument.
     (unless class
       (setq class (ebrowse-tree-at-point)))
-    (with-output-to-temp-buffer ebrowse-member-buffer-name
-      (save-excursion
-	(set-buffer standard-output)
+    (save-selected-window
+      (if temp-buffer
+	  (pop-to-buffer temp-buffer)
+	(pop-to-buffer (get-buffer-create ebrowse-member-buffer-name))
 	;; If new buffer, set the mode and initial values of locals
-	(unless temp-buffer
-	  (ebrowse-member-mode))
-	;; Set local variables
-	(setq ebrowse--member-list (funcall list class)
-	      ebrowse--displayed-class class
-	      ebrowse--accessor list
-	      ebrowse--tree-obarray classes
-	      ebrowse--frozen-flag stand-alone
-	      ebrowse--tags-file-name tags-file-name
-	      ebrowse--header header
-	      ebrowse--tree tree
-	      buffer-read-only t)
-	(ebrowse-redisplay-member-buffer)
-	(current-buffer)))))
+	(ebrowse-member-mode))
+      ;; Set local variables
+      (setq ebrowse--member-list (funcall list class)
+	    ebrowse--displayed-class class
+	    ebrowse--accessor list
+	    ebrowse--tree-obarray classes
+	    ebrowse--frozen-flag stand-alone
+	    ebrowse--tags-file-name tags-file-name
+	    ebrowse--header header
+	    ebrowse--tree tree
+	    buffer-read-only t)
+      (ebrowse-redisplay-member-buffer)
+      (current-buffer))))
 
 
 (defun ebrowse-member-display-p (member)