Merge branch 'master' into xwidget
commitfee879f0a00bbe3f3389509874ee30a9cbc24cd4
authorJoakim Verona <joakim@verona.se>
Mon, 19 Jan 2015 23:54:09 +0000 (20 00:54 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 19 Jan 2015 23:54:09 +0000 (20 00:54 +0100)
tree5bc4dc325818bec8a6a4cf20b1c907d23e24425a
parent395a90fee92a836f55df0b879f8ee3d862d648ac
parentfb6462f056f616f3da8ae18037c7c2137fecb6fd
Merge branch 'master' into xwidget
src/dispnew.c
src/lisp.h
src/xdisp.c