Merge from origin/emacs-25

0377fe2 ; Spelling fixes
f253695 Update docs for `customize-mode'
4395aaa Fix documentation of 'assoc-string' and 'compare-strings'
ab0ebb9 ; Only load .elc file in tests.
a98aa02 Error on multibyte characters in HTTP request
ea512a7 * lisp/gnus/mm-decode.el (mm-convert-shr-links): Mask keys th...
8297331 ; Revert "Ensure undo-boundary after insert-file-contents."
dc5e65b Unset GIT_DIR when calling Git commands
6cdd8f7 Ensure undo-boundary after insert-file-contents.
4793f5f Clarify documentation of 'line-spacing' and 'line-height'
5f37572 Fix removal of variables from process-environment
e5e886d * admin/authors.el (authors-ignored-files, authors-valid-file...
db0777b * admin/authors.el (authors-aliases, authors-fixed-case): Add...

# Conflicts:
#	doc/lispref/modes.texi
#	lisp/gnus/mm-decode.el

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/modes.texi
index 1285c1c69e65fc28e11fddc7c82d6913fe36f229,32baa27147bf50a3c64111389b5ecbb6c8356c3b..368d882a4b86525eb9249e08807ee3c7cf887af0
--- 1/doc/lispref/modes.texi
--- 2/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@@ -799,19 -794,9 +799,18 @@@ if @var{parent} is @code{nil}.  (Again
  
  @item :group
  If this is specified, the value should be the customization group for
- this mode.  (Not all major modes have one.)  Only the (still
- experimental and unadvertised) command @code{customize-mode} currently
- uses this.  @code{define-derived-mode} does @emph{not} automatically
- define the specified customization group.
+ this mode.  (Not all major modes have one.)  The command
+ @code{customize-mode} uses this.  @code{define-derived-mode} does
+ @emph{not} automatically define the specified customization group.
 +
 +@item :after-hook
 +This optional keyword specifies a single Lisp form to evaluate as the
 +final act of the mode function, after the mode hooks have been run.
 +It should not be quoted.  Since the form might be evaluated after the
 +mode function has terminated, it should not access any element of the
 +mode function's local state.  An @code{:after-hook} form is useful for
 +setting up aspects of the mode which depend on the user's settings,
 +which in turn may have been changed in a mode hook.
  @end table
  
  Here is a hypothetical example:

diff --cc doc/lispref/strings.texi
Simple merge

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/gnus/mm-decode.el
index 744474ca1133657f77974f0c393e052a005fb1a1,bb8e2038d26f611ce5956276ee91304feb65daff..c653d735543356a506cc2c4aa08dfce08f3328b5
--- 1/lisp/gnus/mm-decode.el
--- 2/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@@ -1837,9 -1894,9 +1837,10 @@@ If RECURSIVE, search recursively.
                           ,(point-max-marker))))))))
  
  (defvar shr-map)
 +(defvar shr-image-map)
  
  (autoload 'widget-convert-button "wid-edit")
+ (defvar widget-keymap)
  
  (defun mm-convert-shr-links ()
    (let ((start (point-min))

diff --cc lisp/url/url-http.el
Simple merge

diff --cc lisp/vc/vc-git.el
Simple merge

diff --cc src/callproc.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc test/lisp/emulation/viper-tests.el
Simple merge