From: Andrea Corallo <akrl@sdf.org>
Date: Sat, 17 Oct 2020 06:00:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~362
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5791ba5feeb5500433ca43506dda13c7c67ce14;p=emacs.git

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

d5791ba5feeb5500433ca43506dda13c7c67ce14
diff --cc test/lisp/help-fns-tests.el
index 2f6abfb56dd,bdd488de3f2..d9344c355fe
--- a/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))))