Mercurial > emacs
changeset 12020:6ef622c132df
(ediff-setup-control-frame): Make
Ediff delete the old control frame before creating a new one.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Tue, 30 May 1995 19:20:47 +0000 |
| parents | 63ee64941021 |
| children | a0a920f1fad4 |
| files | lisp/ediff-wind.el |
| diffstat | 1 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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)