From: Glenn Morris <rgm@gnu.org>
Date: Sat, 18 Apr 2020 14:50:18 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7550
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6c391080b04d21386136f1a36011284f41ae6ea;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

0ed7177696 * lisp/htmlfontify.el (hfy-force-fontification): Fix bug#4...
---

a6c391080b04d21386136f1a36011284f41ae6ea