diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /src/xfont.c | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/xfont.c')
| -rw-r--r-- | src/xfont.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xfont.c b/src/xfont.c index b73596ce7ce..85fccf0dafd 100644 --- a/src/xfont.c +++ b/src/xfont.c | |||
| @@ -505,7 +505,8 @@ xfont_list (struct frame *f, Lisp_Object spec) | |||
| 505 | Lisp_Object alter; | 505 | Lisp_Object alter; |
| 506 | 506 | ||
| 507 | if ((alter = Fassoc (SYMBOL_NAME (registry), | 507 | if ((alter = Fassoc (SYMBOL_NAME (registry), |
| 508 | Vface_alternative_font_registry_alist), | 508 | Vface_alternative_font_registry_alist, |
| 509 | Qnil), | ||
| 509 | CONSP (alter))) | 510 | CONSP (alter))) |
| 510 | { | 511 | { |
| 511 | /* Pointer to REGISTRY-ENCODING field. */ | 512 | /* Pointer to REGISTRY-ENCODING field. */ |