# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 801861647 0
# Node ID 6ef622c132dfab5a9442dfc07b89c1504956c3f3
# Parent  63ee64941021f4a2523d139161dff6d4e8e318ea
(ediff-setup-control-frame): Make
Ediff delete the old control frame before creating a new one.

diff -r 63ee64941021 -r 6ef622c132df lisp/ediff-wind.el
--- a/lisp/ediff-wind.el	Tue May 30 18:47:11 1995 +0000
+++ b/lisp/ediff-wind.el	Tue May 30 19:20:47 1995 +0000
@@ -768,18 +768,14 @@
       (run-hooks 'ediff-before-setup-control-frame-hooks))
   
     (setq old-ctl-frame (ediff-eval-in-buffer ctl-buffer ediff-control-frame))
-    (if (and (ediff-frame-live-p old-ctl-frame)
-	     (eq (window-frame (cdr (assq 'minibuffer (frame-parameters old-ctl-frame))))
-		 designated-minibuffer-frame))
-	(setq ctl-frame old-ctl-frame)
-      (redraw-display)
-      ;; Make the frame while ctl-buff is current, so that
-      ;; ediff-control-frame-parameters will have the right value.
-      (ediff-eval-in-buffer ctl-buffer
-	(let ((default-minibuffer-frame designated-minibuffer-frame))
-	  (setq ctl-frame (ediff-make-frame 
-			   ediff-control-frame-parameters))))
-      (ediff-eval-in-buffer ctl-buffer (setq ediff-control-frame ctl-frame)))
+    (if (frame-live-p old-ctl-frame) (delete-frame old-ctl-frame))
+    (redraw-display)
+    ;; Make the frame while ctl-buff is current, so that
+    ;; ediff-control-frame-parameters will have the right value.
+    (ediff-eval-in-buffer ctl-buffer
+      (let ((default-minibuffer-frame designated-minibuffer-frame))
+	(setq ctl-frame (ediff-make-frame ediff-control-frame-parameters)
+	      ctl-buffer (setq ediff-control-frame ctl-frame))))
     
     (setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame))
     (ediff-select-frame ctl-frame)