Merge commit '8571dbde639e0ee9885bad49c9e180474bd23646'

Conflicts:
	libguile/procprop.c

diff --cc libguile/async.h
index 68952b0,b3503de..e6fe523
--- 1/libguile/async.h
--- 2/libguile/async.h
+++ b/libguile/async.h
@@@ -75,9 -75,25 +75,25 @@@ SCM_API void scm_critical_section_end (
      SCM_I_CURRENT_THREAD->critical_section_level--;           \
      SCM_I_CURRENT_THREAD->block_asyncs--;                     \
      scm_i_pthread_mutex_unlock (&scm_i_critical_section_mutex); \
 -    scm_async_click ();                                               \
 +    scm_async_tick ();                                                \
    } while (0)
  
+ # define scm_i_pthread_mutex_lock_block_asyncs(m)      \
+   do                                                   \
+     {                                                  \
+       SCM_I_CURRENT_THREAD->block_asyncs++;            \
+       scm_i_pthread_mutex_lock (m);                    \
+     }                                                  \
+   while (0)
+ 
+ # define scm_i_pthread_mutex_unlock_unblock_asyncs(m)  \
+   do                                                   \
+     {                                                  \
+       scm_i_pthread_mutex_unlock (m);                  \
+       SCM_I_CURRENT_THREAD->block_asyncs--;            \
+     }                                                  \
+   while (0)
+ 
  #else /* !BUILDING_LIBGUILE */
  
  # define SCM_CRITICAL_SECTION_START  scm_critical_section_start ()

diff --cc libguile/threads.c
Simple merge

diff --cc libguile/threads.h
index d34e1ab,5398218..6db6c75
--- 1/libguile/threads.h
--- 2/libguile/threads.h
+++ b/libguile/threads.h
@@@ -140,7 -143,11 +140,8 @@@ SCM_INTERNAL void scm_init_threads (voi
  SCM_INTERNAL void scm_init_thread_procs (void);
  SCM_INTERNAL void scm_init_threads_default_dynamic_state (void);
  
+ SCM_INTERNAL void scm_i_dynwind_pthread_mutex_lock_block_asyncs (scm_i_pthread_mutex_t *mutex);
  
 -#define SCM_THREAD_SWITCHING_CODE \
 -  do { } while (0)
 -
  SCM_API SCM scm_call_with_new_thread (SCM thunk, SCM handler);
  SCM_API SCM scm_yield (void);
  SCM_API SCM scm_cancel_thread (SCM t);

diff --cc module/Makefile.am
Simple merge