merge from trunk
commitf909b7cfa7ccac86db11ea8698d01b167a7f37d6
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 14:42:37 +0000 (23 16:42 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 14:42:37 +0000 (23 16:42 +0200)
treef0e9593932db1cd32000337ff00699859a155c37
parent95a60dc06b2d05485a702e62ee00834a71753922
parent6c6014d4cc93c33a964acd246e792e1bd73f910d
merge from trunk
src/xdisp.c