diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-14 02:51:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-14 02:51:30 -0800 |
| commit | 59815c02506eb39b61e672528ed03885749ba529 (patch) | |
| tree | 08770ed78fae3dc1a0996250d61e127ebfd135fd /src/ftfont.c | |
| parent | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (diff) | |
| parent | 898169a2d88c3538cdfd41feb0b16267165065bd (diff) | |
| download | emacs-59815c02506eb39b61e672528ed03885749ba529.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 2f0643a31e0..31f3372af5c 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -960,7 +960,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec) /* Need fix because this finds any fonts. */ if (fontset->nfont == 0 && ! NILP (family)) { - /* Try maching with configuration. For instance, the + /* Try matching with configuration. For instance, the configuration may specify "Nimbus Mono L" as an alias of "Courier". */ FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, |