On 05/24/2012 12:03 PM, Dodji Seketeli wrote: > + if (macro != NULL) > + pfile->about_to_expand_macro_p = false; The approach sounds good, but why do this in the push_token_context functions rather than in enter_macro_context? Jason