Merge branch 'master' into comment-cachecomment-cache
commitf4d5b687150810129b7a1d5b006e31ccf82b691b
authorAlan Mackenzie <acm@muc.de>
Sun, 12 Feb 2017 10:59:03 +0000 (12 10:59 +0000)
committerAlan Mackenzie <acm@muc.de>
Sun, 12 Feb 2017 10:59:03 +0000 (12 10:59 +0000)
tree4229b13800349032697daae3904dc3773e6b7a80
parentd5514332d4a6092673ce1f78fadcae0c57f7be64
parent148100d98319499f0ac6f57b8be08cbd14884a5c
Merge branch 'master' into comment-cache
lisp/progmodes/cc-engine.el
src/buffer.c
src/insdel.c
src/lisp.h
src/syntax.c
src/textprop.c