From: Glenn Morris <rgm@gnu.org>
Date: Sat, 19 Jun 2021 14:50:54 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~18^2~2328
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f8e5871c16a7b36b46833485dbe198ce90922ea5;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

b94532f028 * src/xdisp.c (Fwindow_text_pixel_size): Plug memory leak....
---

f8e5871c16a7b36b46833485dbe198ce90922ea5