emacs: lisp/ediff-wind.el comparison

(ediff-setup-control-frame): Make Ediff delete the old control frame before creating a new one.

comparison

equal deleted inserted replaced

-:63ee64941021
+:6ef622c132df
 (ediff-eval-in-buffer ctl-buffer
 (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)
+(if (frame-live-p old-ctl-frame) (delete-frame old-ctl-frame))
-	     (eq (window-frame (cdr (assq 'minibuffer (frame-parameters old-ctl-frame))))
+(redraw-display)
-		 designated-minibuffer-frame))
+;; Make the frame while ctl-buff is current, so that
-	(setq ctl-frame old-ctl-frame)
+;; ediff-control-frame-parameters will have the right value.
-(redraw-display)
+(ediff-eval-in-buffer ctl-buffer
-;; Make the frame while ctl-buff is current, so that
+(let ((default-minibuffer-frame designated-minibuffer-frame))
-;; ediff-control-frame-parameters will have the right value.
+	(setq ctl-frame (ediff-make-frame ediff-control-frame-parameters)
-(ediff-eval-in-buffer ctl-buffer
+	      ctl-buffer (setq ediff-control-frame ctl-frame))))
-	(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)))
 (setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame))
 (ediff-select-frame ctl-frame)
 (if (window-dedicated-p (selected-window))
 	()

Mercurial > emacs