From: Noam Postavsky <npostavs@gmail.com>
Date: Sun, 10 Jun 2018 22:43:43 +0000 (-0400)
Subject: ; Merge from emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~5276
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=78ac2480d7bd206f3207398a31830bf0625caf0a;p=emacs.git

; Merge from emacs-26

The following commits were skipped:

acaebed014 ; * src/ftfont.c (ftfont_spec_pattern): Fix whitespace.
97d61f878e Port FC_COLOR change to older fontconfig
---

78ac2480d7bd206f3207398a31830bf0625caf0a