From: Glenn Morris <rgm@gnu.org>
Date: Thu, 18 Mar 2021 15:50:32 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~3227
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88ab1d1cc465c7403c8d381083835d86c4a6964b;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

b9ec6111e2 Fix buffer overflow in xbm_scan (bug#47094)
---

88ab1d1cc465c7403c8d381083835d86c4a6964b