Merge branch 'master' into comment-cache
commitd5514332d4a6092673ce1f78fadcae0c57f7be64
authorAlan Mackenzie <acm@muc.de>
Sun, 5 Feb 2017 16:28:53 +0000 (5 16:28 +0000)
committerAlan Mackenzie <acm@muc.de>
Sun, 5 Feb 2017 16:28:53 +0000 (5 16:28 +0000)
tree1780337154904dcfad8ecfa76614b47c082160dd
parentcecc25c68f5a1834c356e18259aa2af402a70ce1
parentde3336051ef74e0c3069374ced5b5fc7bb9fba15
Merge branch 'master' into comment-cache
doc/emacs/programs.texi
lisp/progmodes/cc-defs.el
lisp/progmodes/cc-engine.el
src/buffer.c
src/buffer.h
src/insdel.c
src/lisp.h
src/syntax.c
src/syntax.h
src/textprop.c