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

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ChangeLog.1 b/test/ChangeLog.1
index 3520f13df60..367ca74b7b9 100644
--- a/test/ChangeLog.1
+++ b/test/ChangeLog.1
@@ -79,7 +79,7 @@
         * indent/js-indent-first-initialiser-dynamic.js:
         New tests for `js-indent-first-initialiser'.
 
-2015-03-10  Przemyslaw Wojnowski  <esperanto@cumego.com>
+2015-03-10  Przemysław Wojnowski  <esperanto@cumego.com>
 
         * automated/cl-lib-tests.el: Add tests for plusp, second, ...
         (cl-lib-test-plusp, cl-lib-test-minusp)
diff --git a/test/lisp/emulation/viper-tests.el b/test/lisp/emulation/viper-tests.el
index 074dd637538..0d6095b2c92 100644
--- a/test/lisp/emulation/viper-tests.el
+++ b/test/lisp/emulation/viper-tests.el
@@ -38,7 +38,7 @@ after itself, although it will leave a buffer called
         ;; Select an expert-level for the same reason.
         (viper-expert-level 5)
         ;; viper loads this even with -q so make sure it's empty!
-        (viper-custom-file-name (make-temp-file "viper-tests"))
+        (viper-custom-file-name (make-temp-file "viper-tests" nil ".elc"))
         (before-buffer (current-buffer)))
     (unwind-protect
         (progn