Ah, and you probably need the patch for xdisp.c...