merge from trunk
commitbc468f0f25e0a9c10a4c7023a37cfc9be369b69d
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 09:46:28 +0000 (26 11:46 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 09:46:28 +0000 (26 11:46 +0200)
treeb7b5ed39cdfb57b96f05bb98b97c3bacc1686aff
parent40d74a503910168002cb1e170494d2f6d1adfeba
parentc80016b3c123a76970d8f9dbbff61aeb5319c919
merge from trunk
src/window.c
src/xdisp.c