aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-07-05 11:28:20 +0000
committerKenichi Handa2006-07-05 11:28:20 +0000
commitbc5f6c42bc869c2fd4685d6fed458ed2542d17aa (patch)
tree46d54c66058e4308aa29a6a3f7c159a9481add4d /src
parentb69c960298d8e983b24fcea956f0f09907bd59ab (diff)
downloademacs-bc5f6c42bc869c2fd4685d6fed458ed2542d17aa.tar.gz
emacs-bc5f6c42bc869c2fd4685d6fed458ed2542d17aa.zip
(ftfont_list): Pay attention to the case that
FC_CAPABILITY is not defined.
Diffstat (limited to 'src')
-rw-r--r--src/ftfont.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c
index 82ea697b92e..fa5208312a8 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -470,8 +470,15 @@ ftfont_list (frame, spec)
470 FC_CHARSET, FC_FILE, NULL); 470 FC_CHARSET, FC_FILE, NULL);
471 if (! objset) 471 if (! objset)
472 goto err; 472 goto err;
473 if (otf_script[0] && ! FcObjectSetAdd (objset, FC_CAPABILITY)) 473 if (otf_script[0])
474 goto err; 474 {
475#ifndef FC_CAPABILITY
476 goto finish;
477#else /* not FC_CAPABILITY */
478 if (! FcObjectSetAdd (objset, FC_CAPABILITY))
479 goto err;
480 }
481#endif /* not FC_CAPABILITY */
475 482
476 fontset = FcFontList (NULL, pattern, objset); 483 fontset = FcFontList (NULL, pattern, objset);
477 if (! fontset) 484 if (! fontset)
@@ -512,6 +519,7 @@ ftfont_list (frame, spec)
512 || this > FC_WEIGHT_MEDIUM))) 519 || this > FC_WEIGHT_MEDIUM)))
513 continue; 520 continue;
514 } 521 }
522#ifdef FC_CAPABILITY
515 if (otf_script[0]) 523 if (otf_script[0])
516 { 524 {
517 FcChar8 *this; 525 FcChar8 *this;
@@ -521,6 +529,7 @@ ftfont_list (frame, spec)
521 || ! strstr ((char *) this, otf_script)) 529 || ! strstr ((char *) this, otf_script))
522 continue; 530 continue;
523 } 531 }
532#endif /* FC_CAPABILITY */
524 entity = ftfont_pattern_entity (fontset->fonts[i], frame, registry); 533 entity = ftfont_pattern_entity (fontset->fonts[i], frame, registry);
525 if (! NILP (entity)) 534 if (! NILP (entity))
526 val = Fcons (entity, val); 535 val = Fcons (entity, val);