From: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Fri, 15 May 2015 05:51:58 +0000 (+0200)
Subject: Merge branch 'master' of ssh://suckless.org/gitrepos/st
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=c03548750b2527a6ddb5edfd945c5799066a6224;hp=-c;p=st.git

Merge branch 'master' of ssh://suckless.org/gitrepos/st
---

c03548750b2527a6ddb5edfd945c5799066a6224
diff --combined st.c
index c0a9bf3,55a5c56..0c6b9c3
--- a/st.c
+++ b/st.c
@@@ -1069,7 -1069,6 +1069,7 @@@ voi
  selclear(XEvent *e) {
  	if(sel.ob.x == -1)
  		return;
 +	sel.mode = SEL_IDLE;
  	sel.ob.x = -1;
  	tsetdirt(sel.nb.y, sel.ne.y);
  }
@@@ -3664,7 -3663,7 +3664,7 @@@ drawregion(int x1, int y1, int x2, int 
  		term.dirty[y] = 0;
  
  		specs = term.specbuf;
 -		numspecs = xmakeglyphfontspecs(specs, &term.line[y][0], x2 - x1, x1, y);
 +		numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y);
  
  		i = ox = 0;
  		for(x = x1; x < x2 && i < numspecs; x++) {
@@@ -4011,7 -4010,7 +4011,7 @@@ main(int argc, char *argv[]) 
  		opt_class = EARGF(usage());
  		break;
  	case 'e':
- 		if(argc > 1)
+ 		if(argc > 0)
  			--argc, ++argv;
  		goto run;
  	case 'f':