aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto E. Vargas Caballero <k0ga@shike2.com>2015-03-19 08:36:50 +0000
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2015-03-19 08:36:50 +0000
commitc9357a8edfe6d047da95b85c5f3c18b9db40d172 (patch)
tree3eae1d5a920deac28a2cbd1164b911e8a82f0fc0
parent580302f3179ef3f24cf0329755686dfa7100996b (diff)
parent246c3481d780067dd3294edbd58cf980c2d960a3 (diff)
downloadst-c9357a8edfe6d047da95b85c5f3c18b9db40d172.tar.gz
st-c9357a8edfe6d047da95b85c5f3c18b9db40d172.tar.bz2
Merge remote-tracking branch 'origin/master'
-rw-r--r--Makefile2
-rw-r--r--st.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 52af636..6158ab2 100644
--- 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
--- 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,