]> git.eshelyaron.com Git - emacs.git/commit
* lisp/vc/ediff-wind.el: Don't pop spurious frame in corner case
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 27 Oct 2017 02:15:41 +0000 (22:15 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 27 Oct 2017 02:15:41 +0000 (22:15 -0400)
commitc015f935e06cf2ba3ef8f69f5ef086fc1e51c9d1
treeb7bf261eed020544273e971fe2a5cbf32c55794d
parent1ad56d0a6bdd07c722a3c161096a16f70d1cbb35
* lisp/vc/ediff-wind.el: Don't pop spurious frame in corner case

(ediff-setup-windows-multiframe-compare): Clarify control-flow.
Postpone the initial call to ediff-skip-unsuitable-frames until we're
sure it's needed to avoid creating a spurious new frame.
(ediff-setup-windows, ediff-setup-windows-plain)
(ediff-setup-windows-plain-merge, ediff-setup-control-frame)
(ediff-setup-windows-plain-compare, ediff-setup-windows-multiframe)
(ediff-setup-windows-multiframe-merge): Use with-current-buffer.
lisp/vc/ediff-wind.el