merge from trunk

diff --cc configure.ac
Simple merge

diff --cc src/alloc.c
index 4cc9b3e1a1376ca7a618a974f753285ccc22d0b5,81742e1ffc1bc46856ae14cb57dcbb15fe546471..9b5f2955aa565878ec0a633d9cd32f5020de17bc
--- 1/src/alloc.c
--- 2/src/alloc.c
+++ b/src/alloc.c
@@@ -4760,12 -4743,26 +4762,16 @@@ flush_stack_call_func (void (*func) (vo
  #endif /* not GC_SAVE_REGISTERS_ON_STACK */
  #endif /* not HAVE___BUILTIN_UNWIND_INIT */
  
 -  /* This assumes that the stack is a contiguous region in memory.  If
 -     that's not the case, something has to be done here to iterate
 -     over the stack segments.  */
 -  mark_memory (stack_base, end);
 -
 -  /* Allow for marking a secondary stack, like the register stack on the
 -     ia64.  */
 -#ifdef GC_MARK_SECONDARY_STACK
 -  GC_MARK_SECONDARY_STACK ();
 -#endif
 +  self->stack_top = end;
 +  (*func) (arg);
  
 -#if GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS
 -  check_gcpros ();
 -#endif
 +  eassert (current_thread == self);
  }
  
+ #else /* GC_MARK_STACK == 0 */
+ 
+ #define mark_maybe_object(obj) emacs_abort ()
+ 
  #endif /* GC_MARK_STACK != 0 */
  
  

diff --cc src/lisp.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/process.h
Simple merge

diff --cc src/window.c
Simple merge