From: Glenn Morris <rgm@gnu.org>
Date: Wed, 8 Jan 2020 17:03:04 +0000 (-0800)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7908^2~155
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8a0b02949342b887822e7756fd36f06536c9c01;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

088bfcc2d8 Move “Fix some broken conditional forms” to master
---

f8a0b02949342b887822e7756fd36f06536c9c01