From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 5 Jul 2006 17:38:31 +0000 (+0000)
Subject: * ftfont.c (ftfont_list): Move misplaced #endif
X-Git-Tag: emacs-pretest-23.0.90~8295^2~832
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ed089581a49f8f0eba2d911203ff5db57eac322;p=emacs.git

* ftfont.c (ftfont_list): Move misplaced #endif
---

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 @@
+2006-07-05  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* ftfont.c (ftfont_list): Move misplaced #endif
+
 2006-07-05  Kenichi Handa  <handa@m17n.org>
 
 	* 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)
 #else  /* not FC_CAPABILITY */
       if (! FcObjectSetAdd (objset, FC_CAPABILITY))
 	goto err;
-    }
 #endif	/* not FC_CAPABILITY */
+    }
 
   fontset = FcFontList (NULL, pattern, objset);
   if (! fontset)