Merge remote-tracking branch 'origin/master'

2015-03-19 08:36:50 +00:00 · 2015-03-19 08:36:50 +00:00 · c9357a8edf
commit c9357a8edf
parent 580302f317 246c3481d7
2 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@ -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}
--- 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,