Merge remote-tracking branch 'origin/master'

This commit is contained in:
Roberto E. Vargas Caballero 2015-03-19 08:36:50 +00:00
commit c9357a8edf
2 changed files with 3 additions and 1 deletions

View file

@ -34,7 +34,7 @@ clean:
dist: clean dist: clean
@echo creating dist tarball @echo creating dist tarball
@mkdir -p st-${VERSION} @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} @tar -cf st-${VERSION}.tar st-${VERSION}
@gzip st-${VERSION}.tar @gzip st-${VERSION}.tar
@rm -rf st-${VERSION} @rm -rf st-${VERSION}

2
st.c
View file

@ -996,6 +996,8 @@ selnotify(XEvent *e) {
ofs = 0; ofs = 0;
xsev = (XSelectionEvent *)e; xsev = (XSelectionEvent *)e;
if (xsev->property == None)
return;
do { do {
if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs, if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
BUFSIZ/4, False, AnyPropertyType, BUFSIZ/4, False, AnyPropertyType,