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.zip
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:
34dist: clean 34dist: clean
35 @echo creating dist tarball 35 @echo creating dist tarball
36 @mkdir -p st-${VERSION} 36 @mkdir -p st-${VERSION}
37 @cp -R LICENSE Makefile README config.mk config.def.h st.info st.1 ${SRC} st-${VERSION} 37 @cp -R LICENSE Makefile README config.mk config.def.h st.info st.1 arg.h ${SRC} st-${VERSION}
38 @tar -cf st-${VERSION}.tar st-${VERSION} 38 @tar -cf st-${VERSION}.tar st-${VERSION}
39 @gzip st-${VERSION}.tar 39 @gzip st-${VERSION}.tar
40 @rm -rf st-${VERSION} 40 @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) {
996 996
997 ofs = 0; 997 ofs = 0;
998 xsev = (XSelectionEvent *)e; 998 xsev = (XSelectionEvent *)e;
999 if (xsev->property == None)
1000 return;
999 do { 1001 do {
1000 if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs, 1002 if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
1001 BUFSIZ/4, False, AnyPropertyType, 1003 BUFSIZ/4, False, AnyPropertyType,