Merge from origin/emacs-25

2c117fc * etc/NEWS: Document new mpc.el features
71a0496 * lisp/custom.el (defface): Revert indentation change.  (Bug#22524)
9dfece1 Correctly fontify C++ initializations which "look like" functions.
4485222 Improve newsticker-treeview-selection-face
4236944 Minor fix in tagging Ruby accessors by etags
35fc77d Spelling fixes
3dda110 Remove 'def X' from the example

diff --cc etc/NEWS
Simple merge

diff --cc lib-src/etags.c
Simple merge

diff --cc lisp/erc/erc.el
Simple merge

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc test/manual/etags/CTAGS.good
Simple merge

diff --cc test/manual/etags/ETAGS.good_1
Simple merge

diff --cc test/manual/etags/ETAGS.good_2
Simple merge

diff --cc test/manual/etags/ETAGS.good_3
Simple merge

diff --cc test/manual/etags/ETAGS.good_4
Simple merge

diff --cc test/manual/etags/ETAGS.good_5
Simple merge

diff --cc test/manual/etags/ETAGS.good_6
Simple merge