diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-05-30 19:20:47 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-05-30 19:20:47 +0000 |
| commit | 22d4cf7b1c3574b80de8ea71dcd5fc4591054e47 (patch) | |
| tree | b9f048cc9c8ffa463ad5488f94dbe3065fc6d476 | |
| parent | 77eb07656dddfc593510fe6e8f85ca6ff26000be (diff) | |
| download | emacs-22d4cf7b1c3574b80de8ea71dcd5fc4591054e47.tar.gz | |
(ediff-setup-control-frame): Make
Ediff delete the old control frame before creating a new one.
| -rw-r--r-- | lisp/ediff-wind.el | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 6d75113364a..6ad7eaa97a9 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -768,18 +768,14 @@ into icons, regardless of the window manager.") (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) |