Merge branch 'master' into comment-cache
commit41432237f2f555db7bc4656394f4264179701d93
authorAlan Mackenzie <acm@muc.de>
Fri, 11 Mar 2016 23:42:19 +0000 (11 23:42 +0000)
committerAlan Mackenzie <acm@muc.de>
Fri, 11 Mar 2016 23:42:19 +0000 (11 23:42 +0000)
tree45aefc87f490fc3d50f2ec6e7b4a22b393322a50
parente7591bb08fbc12c3656104d6abd0706cf83d0ef4
parent63efcc268635dea78c6bd80749eae4ee2c72d717
Merge branch 'master' into comment-cache
src/buffer.c
src/buffer.h
src/insdel.c
src/syntax.c
src/syntax.h
src/textprop.c