]> git.armaanb.net Git - st.git/commitdiff
Merge branch 'master' of ssh://suckless.org/gitrepos/st
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Fri, 15 May 2015 05:51:58 +0000 (07:51 +0200)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Fri, 15 May 2015 05:51:58 +0000 (07:51 +0200)
1  2 
st.c

diff --combined st.c
index c0a9bf3361f877c2939c4f7d922a04c828ebd23d,55a5c56eefc1feab52f7806bf1666564e19c1e45..0c6b9c3542f646fdcdc5d06c1eb4810ad25858ee
--- 1/st.c
--- 2/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':