Merge from origin/emacs-25

d4b93e1 Minor fixes in global-auto-composition-mode
02b037b Allow arithmetic operators inside C++ template constructs.
44b16f6 Avoid crashes in semi-malformed 'condition-case'
652e5b4 Allow arithmetic operators inside C++ template constructs.
d9ea795 Fix regression with 'recent-keys' and keyboard macros
903603f Fix wording in a doc-view.el comment
cf79616 ; Spelling fixes
f8bf1b3 CONTRIBUTE cleanups and updates
f3aaca3 Port USE_STACK_LISP_OBJECTS fix to Clang
1834ac7 Port to x86 GCC 4.3.1 and earlier
8482949 Fix point movement under 'scroll-conservatively'
c1313b5 Replace colon in file name (not legal on Windows)
f7af26c Fix a typo in edt.texi
8badf95 Make 'mmap_realloc' on MS-Windows more reliable
856cd94 Grep alias `all' shall not match parent directory

diff --cc CONTRIBUTE
index 7cb4a1c7544648a8b228af6a96f3cd27ab81a306,5102b4fe4f14ee22e322cb52526d1d08dc0a66f0..d17e53cc636a5d909e083504066713556b487501
--- 1/CONTRIBUTE
--- 2/CONTRIBUTE
+++ b/CONTRIBUTE
@@@ -228,18 -233,7 +233,18 @@@ above, are recorded by the tracker wit
  GNU ELPA has a 'debbugs' package that allows accessing the tracker
  database from Emacs.
  
- ** Document your changes.
 +Bugs needs regular attention.  A large backlog of bugs is
 +disheartening to the developers, and a culture of ignoring bugs is
 +harmful to users, who expect software that works.  Bugs have to be
 +regularly looked at and acted upon.  Not all bugs are critical, but at
 +the least, each bug needs to be regularly re-reviewed to make sure it
 +is still reproducible.
 +
 +The process of going through old or new bugs and acting on them is
 +called bug triage.  This process is described in the file
 +admin/notes/bug-triage.
 +
+ ** Documenting your changes
  
  Any change that matters to end-users should have an entry in etc/NEWS.
  
@@@ -271,35 -265,20 +276,38 @@@ If your test lasts longer than some fe
  
  To run tests on the entire Emacs tree, run "make check" from the
  top-level directory.  Most tests are in the directory
 -"test/automated".  From the "test/automated" directory, run "make
 -<filename>" to run the tests for <filename>.el(c).  See "test/README"
 -for more information.
 +"test/".  From the "test/" directory, run "make
 +<filename>" to run the tests for <filename>.el(c).  See
 +"test/Makefile" for more information.
 +
 +Tests which are tagged ":expensive-test" are enabled additionally, if
 +you run "make check-expensive" from the top-level directory.  "make
 +<filename>" as mentioned above incorporates expensive tests for
 +<filename>.el(c). You can also define any ert selector on the command
 +line. So "make check SELECTOR=nil" is equivalent to "make
 +check-expensive".
 +
 +You could also use predefined selectors of the Makefile. "make
 +<filename> SELECTOR='$(SELECTOR_DEFAULT)'" runs all tests for
 +<filename>.el(c) except the tests tagged as expensive.
 +
 +Selectors can be defined with different methods, see (info "(ert)Test
 +Selectors") or
 +https://www.gnu.org/software/emacs/manual/html_node/ert/Test-Selectors.html
 +If your test file contains the tests "test-foo", "test2-foo" and
 +"test-foo-remote", and you want to run only the former two tests, you
 +could use a regexp: "make <filename> SELECTOR='\"foo$$\"'" .
  
- ** Understanding Emacs Internals.
+ ** Understanding Emacs internals
+ 
+ The best way to understand Emacs internals is to read the code.  Some
+ source files, such as xdisp.c, have extensive comments describing the
+ design and implementation.  The following resources may also help:
+ 
+ http://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html
+ http://www.gnu.org/software/emacs/manual/html_node/elisp/GNU-Emacs-Internals.html
  
- The best way to understand Emacs Internals is to read the code,
- but the nodes "Tips" and "GNU Emacs Internals" in the Appendix
- of the Emacs Lisp Reference Manual may also help.  Some source files,
- such as xdisp.c, have large commentaries describing the design and
- implementation in more detail.
+ or run 'info "(elisp)Tips"' or 'info "(elisp)GNU Emacs Internals"'.
  
  The file etc/DEBUG describes how to debug Emacs bugs.
  

diff --cc ChangeLog.2
Simple merge

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

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

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge