Merge remote-tracking branch 'origin/master'

diff --git a/Makefile b/Makefile
index 52af636..6158ab2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p st-${VERSION}
-       @cp -R LICENSE Makefile README config.mk config.def.h st.info st.1 ${SRC} st-${VERSION}
+       @cp -R LICENSE Makefile README config.mk config.def.h st.info st.1 arg.h ${SRC} st-${VERSION}
        @tar -cf st-${VERSION}.tar st-${VERSION}
        @gzip st-${VERSION}.tar
        @rm -rf st-${VERSION}

diff --git a/st.c b/st.c
index 00fca99..68dc2be 100644 (file)
--- a/st.c
+++ b/st.c
@@ -996,6 +996,8 @@ selnotify(XEvent *e) {
 
        ofs = 0;
        xsev = (XSelectionEvent *)e;
+       if (xsev->property == None)
+           return;
        do {
                if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
                                        BUFSIZ/4, False, AnyPropertyType,