Merge branch 'master' into xwidget
commit8628a48fec7fcd8bdbbf6ce5808fc574631d1541
authorJoakim Verona <joakim@verona.se>
Tue, 20 Jan 2015 23:26:56 +0000 (21 00:26 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 20 Jan 2015 23:26:56 +0000 (21 00:26 +0100)
tree3dfc3b71850123e7514ddb149a0ba768618cfddf
parentffd9ee1d6412a6e61383930562e6167a458f0d5f
parent0dd19ac82662c5710e73852f438fd55e1d9225b7
Merge branch 'master' into xwidget
src/dispnew.c
src/lisp.h
src/xdisp.c