mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00
Code Issues Releases Activity

(ediff-setup-control-frame): Make

Browse Source 
Ediff delete the old control frame before creating a new one.
This commit is contained in:
Karl Heuer 1995-05-30 19:20:47 +00:00
parent 7a9947284c
commit 8485d210e5
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/ediff-wind.el
View File

@ -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)