<div dir="ltr">Ouch. Merge fail. Fixed.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Dec 20, 2017 at 5:20 AM, Akira TAGOH <span dir="ltr"><<a href="mailto:akira@tagoh.org" target="_blank">akira@tagoh.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Wed, Dec 20, 2017 at 5:05 AM, Behdad Esfahbod<br>
<<a href="mailto:behdad@kemper.freedesktop.org">behdad@kemper.freedesktop.org</a><wbr>> wrote:<br>
> @@ -652,8 +697,6 @@ FcFontRenderPrepare (FcConfig           *config,<br>
>                 if (!l)<br>
>                     goto bail0;<br>
>                 dir = FcStrDirname (FcValueString (&l->value));<br>
> -               if (!config)<br>
> -                       config = FcConfigGetCurrent ();<br>
>                 if (config && FcHashTableFind (config->alias_table, dir, (void **) &alias))<br>
>                 {<br>
>                     FcChar8 *base = FcStrBasename (FcValueString (&l->value));<br>
<br>
</span>Why did you revert this?<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
Akira TAGOH<br>
</font></span><div class="HOEnZb"><div class="h5">______________________________<wbr>_________________<br>
Fontconfig mailing list<br>
<a href="mailto:Fontconfig@lists.freedesktop.org">Fontconfig@lists.freedesktop.<wbr>org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/fontconfig" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/fontconfig</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">behdad<br><a href="http://behdad.org/" target="_blank">http://behdad.org/</a></div>
</div>