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

diff --combined st.c
index 6fef7f3,a104a50..ced72ff
--- 1/st.c
--- 2/st.c
+++ b/st.c
@@@ -3089,7 -3089,7 +3089,7 @@@ xinit(void) 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
 -      XSync(xw.dpy, 0);
 +      XSync(xw.dpy, False);
  }
  
  void
@@@ -3737,8 -3737,8 +3737,8 @@@ run(void) 
        else
                cresize(xw.fw, xw.fh);
  
-       gettimeofday(&lastblink, NULL);
        gettimeofday(&last, NULL);
+       lastblink = last;
  
        for(xev = actionfps;;) {
                long deltatime;
@@@ -3773,7 -3773,7 +3773,7 @@@
                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;
-                       gettimeofday(&lastblink, NULL);
+                       lastblink = now;
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);