From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 24 Jul 1996 16:36:41 +0000 (+0000)
Subject: (edebug-trace-display): Save and restore current buffer.
X-Git-Tag: emacs-19.34~80
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc0e03f39ee87c9fa1f87bf1622aace2624c01e3;p=emacs.git

(edebug-trace-display): Save and restore current buffer.
---

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 5196b6a5ecc..aa56f292c54 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -8,7 +8,7 @@
 ;; LCD Archive Entry:
 ;; edebug|Daniel LaLiberte|liberte@cs.uiuc.edu
 ;; |A source level debugger for Emacs Lisp.
-;; |$Date: 1996/03/20 13:30:16 $|$Revision: 3.6 $|~/modes/edebug.el|
+;; |$Date: 1996/05/29 17:16:52 $|$Revision: 3.7 $|~/modes/edebug.el|
 
 ;; This file is part of GNU Emacs.
 
@@ -85,7 +85,7 @@
 ;;; Code:
 
 (defconst edebug-version
-  (let ((raw-version "$Revision: 3.6 $"))
+  (let ((raw-version "$Revision: 3.7 $"))
     (substring raw-version (string-match "[0-9.]*" raw-version)
 	       (match-end 0))))
      
@@ -4140,7 +4140,8 @@ You must include newlines in FMT to break lines, but one newline is appended."
 ;;	 (edebug-trace-display "*trace-point*"
 ;;	  "saving: point = %s  window-start = %s"
 ;;	  (point) (window-start))
-  (let* ((selected-window (selected-window))
+  (let* ((oldbuf (current-buffer))
+	 (selected-window (selected-window))
 	 (buffer (get-buffer-create buf-name))
 	 buf-window)
 ;;    (message "before pop-to-buffer") (sit-for 1)
@@ -4156,7 +4157,8 @@ You must include newlines in FMT to break lines, but one newline is appended."
 ;;    (set-window-point buf-window (point))
 ;;    (edebug-sit-for 0)
     (bury-buffer buffer)
-    (select-window selected-window))
+    (select-window selected-window)
+    (set-buffer oldbuf))
   buf-name)