From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 16 Dec 2021 05:31:48 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3592^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7a6d6a546e7e56e5a721aac86a19473e4303111;p=emacs.git

Merge from origin/emacs-28

1e578267fb Fix control buffer window height in 'ediff-setup-control-b...
---

e7a6d6a546e7e56e5a721aac86a19473e4303111