From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Mar 2021 15:26:34 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~3143
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b702225619afebb3d5becb95d142a60a9f62f60e;p=emacs.git

Merge from origin/emacs-27

deef5efafb ; * ChangeLog.3: Update with the log of the last change.
bd991e3c9b Fix frame-inner-height in non-GUI builds
---

b702225619afebb3d5becb95d142a60a9f62f60e