; 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
This commit is contained in:
Noam Postavsky 2018-06-10 18:43:43 -04:00
commit 78ac2480d7

Diff content is not available