master updated (0bd6ae7 -> ae3c510)

[Micha? Nazarewicz]

mina86 pushed a change to branch master.

      from  0bd6ae7   Only treat display strings as buttons if they have 
'button' property
       new  fab2332   cc-mode: add ‘c-lineup-ternary-bodies’  (bug#41061)
       new  ae3c510   cc-mode: extend regexp used by ‘c-or-c++-mode’


Summary of changes:
 doc/misc/cc-mode.texi                | 20 ++++++++++++++++++++
 etc/NEWS                             | 17 +++++++++++++++++
 lisp/progmodes/cc-align.el           | 32 ++++++++++++++++++++++++++++++++
 lisp/progmodes/cc-mode.el            | 21 +++++++++++++++------
 test/lisp/progmodes/cc-mode-tests.el | 33 +++++++++++++++++++++++++++++++--
 5 files changed, 115 insertions(+), 8 deletions(-)