Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc lisp/emacs-lisp/package.el
Simple merge

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

diff --cc lisp/subr.el
Simple merge

diff --cc test/lisp/help-fns-tests.el
index 2f6abfb56dd1936beecad6df4328079fb0c46841,bdd488de3f2ace20746ce241ad366e254199ecbb..d9344c355fee142c33441381f793f59b8c287bc5
--- 1/test/lisp/help-fns-tests.el
--- 2/test/lisp/help-fns-tests.el
+++ b/test/lisp/help-fns-tests.el
@@@ -61,16 -61,12 +61,16 @@@ Return first line of the output of (des
      (should (string-match regexp result))))
  
  (ert-deftest help-fns-test-lisp-defun ()
 -  (let ((regexp "a compiled Lisp function in .+subr\\.el")
 +  (let ((regexp (if (boundp 'comp-ctxt)
-                     "a native compiled Lisp function in .subr\\.el"
-                   "a compiled Lisp function in .subr\\.el"))
++                    "a native compiled Lisp function in .+subr\\.el"
++                  "a compiled Lisp function in .+subr\\.el"))
          (result (help-fns-tests--describe-function 'last)))
      (should (string-match regexp result))))
  
  (ert-deftest help-fns-test-lisp-defsubst ()
 -  (let ((regexp "a compiled Lisp function in .+subr\\.el")
 +  (let ((regexp (if (boundp 'comp-ctxt)
-                     "a native compiled Lisp function in .subr\\.el"
-                   "a compiled Lisp function in .subr\\.el"))
++                    "a native compiled Lisp function in .+subr\\.el"
++                  "a compiled Lisp function in .+subr\\.el"))
          (result (help-fns-tests--describe-function 'posn-window)))
      (should (string-match regexp result))))