[Emacs-diffs] master b2aef81: ; * src/emacs-module.c (module_assert_thread): Simplify.

[Philipp Stephani]

branch: master
commit b2aef8122ad1404854728615ca03a7f3cd3f93a3
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>

    ; * src/emacs-module.c (module_assert_thread): Simplify.
---
 src/emacs-module.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/emacs-module.c b/src/emacs-module.c
index b80aa23..c5e56b1 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -817,11 +817,13 @@ in_current_thread (void)
 static void
 module_assert_thread (void)
 {
-  if (! module_assertions || (in_current_thread () && ! gc_in_progress))
+  if (!module_assertions)
     return;
-  module_abort (gc_in_progress ?
-                "Module function called during garbage collection" :
-                "Module function called from outside the current Lisp thread");
+  if (!in_current_thread ())
+    module_abort ("Module function called from outside "
+                  "the current Lisp thread");
+  if (gc_in_progress)
+    module_abort ("Module function called during garbage collection");
 }
 
 static void