Merge remote-tracking branch 'origin/master' into omaster

diff --combined st.c
index 12e1e1f,d0a6218..8cfa2f7
--- 1/st.c
--- 2/st.c
+++ b/st.c
@@@ -3579,6 -3579,7 +3579,6 @@@ kpress(XEvent *ev) 
                return;
  
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
 -      e->state &= ~Mod2Mask;
        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {
@@@ -3686,6 -3687,8 +3686,8 @@@ run(void) 
        gettimeofday(&last, NULL);
  
        for(xev = actionfps;;) {
+               long deltatime;
+ 
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
@@@ -3719,8 -3722,9 +3721,9 @@@
                        gettimeofday(&lastblink, NULL);
                        dodraw = 1;
                }
-               if(TIMEDIFF(now, last) \
-                               > (xev? (1000/xfps) : (1000/actionfps))) {
+               deltatime = TIMEDIFF(now, last);
+               if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
+                               || deltatime < 0) {
                        dodraw = 1;
                        last = now;
                }