Merge from origin/emacs-25

ce4a052 Add defvar-local to lisp-imenu-generic-expression
a0121bc Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
76fe2d5 * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
1ae088f * lisp/emacs-lisp/autoload.el (autoload-find-destination):
b6b47af Properly encode/decode base64Binary data in SOAP
c632466 Obey coding-system-for-write when writing stdout/stderr in batch
2f32cb5 * doc/misc/efaq.texi (Packages that do not come with Emacs):
        Update the URI of MELPA and marmalade-repo.
        Reported by CHENG Goa <chenggao@royau.me> in
        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
d2937aa * lisp/progmodes/opascal.el (opascal-mode-syntax-table):
5330c25 * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
7380990 Remove function wrongly on AWK Mode value of context
fontification hook.
d400753 * src/buffer.c: Stick with ASCII in doc string.
221240c Reword transient-mark-mode doc string
977d3ea Update doc string of 'selective-display'
229c3fa Make C++ buffers writeable when writing their initial text
        properties.
f5c762c Additional changes for "make check-expensive"
1729cf3 ; * admin/MAINTAINERS: Remove myself.
33219d3 Apply text properties for <, > in new after-change function
        (C++ Java Modes).

diff --cc CONTRIBUTE
index 19ec68221c467823eefd4c69a8e34116feeef2c5,9c53fe2ccccc4b5dbe90894501c3bf34f65da3f1..323f9b9d060a1e71262b485e9dac815d75b8638b
--- 1/CONTRIBUTE
--- 2/CONTRIBUTE
+++ b/CONTRIBUTE
@@@ -262,12 -251,20 +262,20 @@@ Emacs uses ERT, Emacs Lisp Regression T
  "(ert)") or https://www.gnu.org/software/emacs/manual/html_node/ert/
  for more information on writing and running tests.
  
+ If your test lasts longer than some few seconds, mark it in its
+ `ert-deftest' definition with ":tags '(:expensive-test)".
+ 
  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
 +"test/".  From the "test/" directory, run "make
  <filename>" to run the tests for <filename>.el(c).  See
 -"test/automated/Makefile" for more information.
 +"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).
+ 
  ** Understanding Emacs Internals.
  
  The best way to understand Emacs Internals is to read the code,

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

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
index 401b419a9939969ca355f7f7f3cade8064125a1c,e688d6be7253fa09c275ead531e8b2d96b5926d8..3405b09e6f5c65f40da2d406750910c9e0e8023a
--- 1/lisp/emacs-lisp/autoload.el
--- 2/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@@ -738,22 -717,12 +739,22 @@@ removes any prior now out-of-date autol
                                 ;; last-time is the time-stamp (specifying
                                 ;; the last time we looked at the file) and
                                 ;; the file hasn't been changed since.
-                                ((listp last-time)
 -                               (and (listp last-time)
 -                                    (not (time-less-p last-time file-time)))
++                               ((listp last-time) (= (length last-time) 2)
 +                                (not (time-less-p last-time file-time)))
 +                               ;; FIXME? Arguably we should throw a
 +                               ;; user error, or some kind of warning,
 +                               ;; if we were called from update-file-autoloads,
 +                               ;; which can update only a single input file.
 +                               ;; It's not appropriate to use the output
 +                               ;; file modtime in such a case,
 +                               ;; if there are multiple input files
 +                               ;; contributing to the output.
 +                               ((and output-time (eq t last-time))
 +                                (not (time-less-p output-time file-time)))
                                 ;; last-time is an MD5 checksum instead.
 -                               (and (stringp last-time)
 -                                    (equal last-time
 -                                           (md5 buf nil nil 'emacs-mule)))))
 +                               ((stringp last-time)
 +                                (equal last-time
 +                                     (md5 buf nil nil 'emacs-mule)))))
                           (throw 'up-to-date nil)
                         (autoload-remove-section begin)
                         (setq found t))))

diff --cc test/Makefile.in
index db386cebe293b4fb14f325556b74eeffda02e72a,48920efe12e5a064b106df5757e9cc0ca08931bc..62443a195efdeb5f1750c26ab320bbc0838b5d89
--- 1/test/Makefile.in
--- 2/test/automated/Makefile.in
+++ b/test/Makefile.in
@@@ -128,15 -121,19 +128,14 @@@ ende
  
  $(foreach test,${TESTS},$(eval $(call test_template,${test})))
  
- 
- ## Re-run all the tests every time.
 +## Include dependencies between test files and the files they test.
 +## We do this without the file and eval directly, but then we would
 +## have to run Emacs for every make invocation, and it might not be
 +## available during clean.
 +-include make-test-deps.mk
+ ## Rerun default tests.
  check:
 -      @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}"
 -
 -## Rerun also expensive tests.
 -.PHONY: check-expensive
 -check-expensive:
 -      @${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}"
 -
 -## Re-run all the tests every time.
 -.PHONY: check-doit
 -check-doit:
 -      -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done
 +      -@for f in $(LOGFILES); do test ! -f $$f || mv $$f $$f~; done
        @${MAKE} check-maybe
  
  ## Only re-run tests whose .log is older than the test.