aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2006-07-05 17:38:31 +0000
committerJan Djärv2006-07-05 17:38:31 +0000
commit5ed089581a49f8f0eba2d911203ff5db57eac322 (patch)
tree03cfc1eabacb0d757731f4bc44ab7a7cdb6fa6e2
parent4c2fdb4f3a8989d161804e0545f7bd08f41829ce (diff)
downloademacs-5ed089581a49f8f0eba2d911203ff5db57eac322.tar.gz
emacs-5ed089581a49f8f0eba2d911203ff5db57eac322.zip
* ftfont.c (ftfont_list): Move misplaced #endif
-rw-r--r--src/ChangeLog.unicode4
-rw-r--r--src/ftfont.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 4080c0a6b3a..7e34fb10b9f 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,7 @@
12006-07-05 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * ftfont.c (ftfont_list): Move misplaced #endif
4
12006-07-05 Kenichi Handa <handa@m17n.org> 52006-07-05 Kenichi Handa <handa@m17n.org>
2 6
3 * ftfont.c (ftfont_list): Pay attention to the case that 7 * ftfont.c (ftfont_list): Pay attention to the case that
diff --git a/src/ftfont.c b/src/ftfont.c
index fa5208312a8..b5b91d1ed30 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -477,8 +477,8 @@ ftfont_list (frame, spec)
477#else /* not FC_CAPABILITY */ 477#else /* not FC_CAPABILITY */
478 if (! FcObjectSetAdd (objset, FC_CAPABILITY)) 478 if (! FcObjectSetAdd (objset, FC_CAPABILITY))
479 goto err; 479 goto err;
480 }
481#endif /* not FC_CAPABILITY */ 480#endif /* not FC_CAPABILITY */
481 }
482 482
483 fontset = FcFontList (NULL, pattern, objset); 483 fontset = FcFontList (NULL, pattern, objset);
484 if (! fontset) 484 if (! fontset)