]> code.delx.au - gnu-emacs/commit
c-forward-<>-arglist no longer directly applies face properties in Java Mode.
authorAlan Mackenzie <acm@muc.de>
Mon, 25 Apr 2016 17:08:26 +0000 (17:08 +0000)
committerAlan Mackenzie <acm@muc.de>
Mon, 25 Apr 2016 17:08:26 +0000 (17:08 +0000)
commitdb2ee1cd63ebebbe52099a1442dbc47f74135e5b
treeff2c48b1aadb81dae65526e02981b52d4f4175d3
parentff9de7b38a3a316529c73e36645182055e2addc4
c-forward-<>-arglist no longer directly applies face properties in Java Mode.

This allows the calling of c-restore-<>-properties from c-common-init without
the test suite giving spurious errors.

* lisp/progmodes/cc-engine.el (c-forward-<>-arglist): Remove the form that
sets face properties.
(c-forward-<>-arglist-recur): Reformulate the bit that handles types inside
template brackets using c-inside-<>-type-key.  Don't bind
c-record-type-identifiers or c-record-found-types around the recursive call,
allowing positions of found types to flow back to the caller.

* lisp/progmodes/cc-langs.el (c-inside-<>-type-kwds, c-inside-<>-type-key):
new lang consts/var.

* lisp/progmodes/cc-mode.el (c-common-init): Don't remove
c-restore-<>-properties from the list of functions called at mode
initialization.
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-langs.el
lisp/progmodes/cc-mode.el