[Emacs-diffs] master 4b04d8a 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit 4b04d8a7d550b9d4a0e83334c80b97d6e8a60ca2
Merge: b43c461 45944e0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 test/src/emacs-module-tests.el | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index eb7c82b..0f4bfae 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -78,13 +78,11 @@ changes."
       (let ((obj (nth 2 body)))
         (should (equal (type-of obj) 'module-function))
         (should (string-match-p
-                 (rx (or "#<module function Fmod_test_sum from "
-                         ;; MS-Windows doesn't allow us to get the
-                         ;; function name, only the address.
-                         (and "#<module function at 0x"
-                              (one-or-more hex-digit)
-                              " from "))
-                     (* nonl) "mod-test" (* nonl) ">")
+                 (rx "#<module function "
+                     (or "Fmod_test_sum"
+                         (and "at 0x" (+ hex-digit)))
+                     (? " from " (* nonl) "mod-test" (* nonl) )
+                     ">")
                  (prin1-to-string obj)))))))
 
 ;;