0.7 release

[st.git] / st.c

diff --git a/st.c b/st.c
index 27536d2..2594c65 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1151,8 +1151,7 @@ selnotify(XEvent *e)
         * Deleting the property again tells the selection owner to send the
         * next data chunk in the property.
         */
-       if (e->type == PropertyNotify)
-               XDeleteProperty(xw.dpy, xw.win, (int)property);
+       XDeleteProperty(xw.dpy, xw.win, (int)property);
 }
 
 void
@@ -3280,7 +3279,7 @@ xloadfont(Font *f, FcPattern *pattern)
        FcResult result;
        XGlyphInfo extents;
 
-       match = FcFontMatch(NULL, pattern, &result);
+       match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
        if (!match)
                return 1;
 
@@ -3346,9 +3345,6 @@ xloadfonts(char *fontstr, double fontsize)
                defaultfontsize = usedfontsize;
        }
 
-       FcConfigSubstitute(0, pattern, FcMatchPattern);
-       FcDefaultSubstitute(pattern);
-
        if (xloadfont(&dc.font, pattern))
                die("st: can't open font %s\n", fontstr);