diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-30 13:42:38 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-30 13:43:24 -0800 |
| commit | 108ef8033be79e9e5567002e85a316ecb5e77cad (patch) | |
| tree | 5fd61d7c2a5e04f0b62402183f0b1ef7733112f3 /src/alloc.c | |
| parent | 966d51592f07ad9de6afebcd828e667cce0f6a27 (diff) | |
| download | emacs-108ef8033be79e9e5567002e85a316ecb5e77cad.tar.gz | |
Rename primary_thread to main_thread
This avoids the confusion of using two different phrases "main thread"
and "primary thread" internally to mean the same thing. See:
http://lists.gnu.org/archive/html/emacs-devel/2016-12/msg01142.html
* src/thread.c (main_thread): Rename from primary_thread,
since the new name no longer clashes with main_thread_id
and Emacs internals normally call this the "main thread".
(init_main_thread): Rename from init_primary_thread.
(main_thread_p): Rename from primary_thread_p.
All uses changed.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index 121d7042353..d74c4bec7e2 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -6404,7 +6404,7 @@ mark_object (Lisp_Object arg) #ifdef GC_CHECK_MARKED_OBJECTS m = mem_find (po); - if (m == MEM_NIL && !SUBRP (obj) && !primary_thread_p (po)) + if (m == MEM_NIL && !SUBRP (obj) && !main_thread_p (po)) emacs_abort (); #endif /* GC_CHECK_MARKED_OBJECTS */ @@ -6416,7 +6416,7 @@ mark_object (Lisp_Object arg) if (pvectype != PVEC_SUBR && pvectype != PVEC_BUFFER - && !primary_thread_p (po)) + && !main_thread_p (po)) CHECK_LIVE (live_vector_p); switch (pvectype) |