]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'master' into comment-cache
authorAlan Mackenzie <acm@muc.de>
Sun, 11 Dec 2016 16:23:17 +0000 (16:23 +0000)
committerAlan Mackenzie <acm@muc.de>
Sun, 11 Dec 2016 16:23:17 +0000 (16:23 +0000)
commitde077da39da7d143f904d6405b62919e5f3e72d6
tree103a323d6f57b96ce36180ecc2cdca3a7bc8fe9d
parent3ec37548b595b3481fd19f82b121d82e6e8f43a5
parentfc0fd24c105bde4c001ebebe4b8b7e1f96cd2871
Merge branch 'master' into comment-cache
lisp/progmodes/cc-defs.el
lisp/progmodes/cc-engine.el
src/buffer.c
src/buffer.h
src/insdel.c
src/syntax.c
src/textprop.c