merge master
commitd0abae34e8a0e19c9647ed24174b082a69c24535
authorJoakim Verona <joakim@verona.se>
Wed, 4 Feb 2015 20:46:19 +0000 (4 21:46 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 4 Feb 2015 20:46:19 +0000 (4 21:46 +0100)
treeafe9b377af2158942b289f4dd35a7d2039755581
parent3952968755d939db25869f909ba1dc72ae6eaff4
parent8e010cf6e7486fae28ec6de80f098c793aee28f3
merge master
src/dispextern.h
src/xdisp.c