X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffont-ft.c;h=a1b24a68b5ab71f59ff0a3eedc4110329106d5a5;hb=38c091dbfa19be7db173231b0b5101577de2098e;hp=e49399ba30d964151a39bcb5efb9041aa23ac391;hpb=188e91fb65773982a7ddb08cc1ce672c3dde59c0;p=m17n%2Fm17n-lib.git

diff --git a/src/font-ft.c b/src/font-ft.c
index e49399b..a1b24a6 100644
--- a/src/font-ft.c
+++ b/src/font-ft.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the m17n library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    02111-1307, USA.  */
 
 #include "config.h"
@@ -137,7 +137,6 @@ static int all_fonts_scaned;
       (s1) = alloca (len), (size) = len;			\
     for (p1 = (s1), p2 = (s2); *p2; p1++, p2++)			\
       *p1 = (*p2 >= 'A' && *p2 <= 'Z' ? *p2 + 'a' - 'A' : *p2);	\
-    while (p1 > (s1) && p1[-1] == ' ') p1--;			\
     *p1 = '\0';							\
   } while (0)
 
@@ -636,7 +635,7 @@ ft_add_font (char *filename)
     return NULL;
   ft_info = ft_gen_font (ft_face);
   FT_Done_Face (ft_face);
-  if (! ft_inf)
+  if (! ft_info)
     return NULL;
 
   font = &ft_info->font;