diff options
| author | Philipp Stephani | 2017-07-09 13:43:45 +0200 |
|---|---|---|
| committer | Philipp Stephani | 2017-07-09 13:43:45 +0200 |
| commit | b2aef8122ad1404854728615ca03a7f3cd3f93a3 (patch) | |
| tree | 45f17545a2f45de5950a8eb4e224b6561bdf079d /src | |
| parent | e15784fbbbd11f3c5edd5d64aa5529e7afbf2ec1 (diff) | |
| download | emacs-b2aef8122ad1404854728615ca03a7f3cd3f93a3.tar.gz emacs-b2aef8122ad1404854728615ca03a7f3cd3f93a3.zip | |
; * src/emacs-module.c (module_assert_thread): Simplify.
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs-module.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/emacs-module.c b/src/emacs-module.c index b80aa23abce..c5e56b1344c 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c | |||
| @@ -817,11 +817,13 @@ in_current_thread (void) | |||
| 817 | static void | 817 | static void |
| 818 | module_assert_thread (void) | 818 | module_assert_thread (void) |
| 819 | { | 819 | { |
| 820 | if (! module_assertions || (in_current_thread () && ! gc_in_progress)) | 820 | if (!module_assertions) |
| 821 | return; | 821 | return; |
| 822 | module_abort (gc_in_progress ? | 822 | if (!in_current_thread ()) |
| 823 | "Module function called during garbage collection" : | 823 | module_abort ("Module function called from outside " |
| 824 | "Module function called from outside the current Lisp thread"); | 824 | "the current Lisp thread"); |
| 825 | if (gc_in_progress) | ||
| 826 | module_abort ("Module function called during garbage collection"); | ||
| 825 | } | 827 | } |
| 826 | 828 | ||
| 827 | static void | 829 | static void |