; Merge from emacs-26
commit78ac2480d7bd206f3207398a31830bf0625caf0a
authorNoam Postavsky <npostavs@gmail.com>
Sun, 10 Jun 2018 22:43:43 +0000 (10 18:43 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Sun, 10 Jun 2018 22:43:43 +0000 (10 18:43 -0400)
tree8b63a8f04ad3a0acee281c92b7b147cdfd70a303
parent23e9beff8cb950112fb9f750d4b3040d3fe36e05
parentacaebed014951fdd13855aa7bba9aee60618785f
; 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