merge from trunk
commitd1ae916c78cf224dd9b107b42d1258db7b096c11
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 09:11:34 +0000 (11 11:11 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 09:11:34 +0000 (11 11:11 +0200)
treea52d37655a89e0ca6df57e2ee3bf13daf3d20798
parent9bdba396e40b4461b78d3fbf8620d6b61004bf39
parent742516e02048d3bbfba4e6e13dd19afa097bbd3b
merge from trunk
src/dispnew.c
src/window.c
src/xdisp.c
src/xterm.c