merge master
commit5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315
authorJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 07:27:13 +0000 (22 08:27 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 07:27:13 +0000 (22 08:27 +0100)
treec9e3511c8164d2154c91820e0d90521762dc7bdf
parentd6ada5ae0fad7a5c85eb28b102bc460e9fe0aceb
parent7f4e7dd378c456b498c270b47b46aaae365a72ab
merge master
src/dispnew.c
src/lisp.h
src/xdisp.c