merge from trunk
commit9d72cbde8b1a6b9b391a1966fe54def9b56c9746
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 03:16:38 +0000 (23 05:16 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 03:16:38 +0000 (23 05:16 +0200)
tree2502c9e0c691cba14202a39f06a2e7916b204390
parentfffcc46aabbe28b6f2ef8427f858abe58d3b615e
parent7f780da621d462afa3c6e0374590a86de513f863
merge from trunk
src/dispextern.h
src/dispnew.c
src/xdisp.c