Bastien writes:
> As for XEmacs and Emacs 22, I'm fine with anything that
> helps supporting these emacsen, unless it adds too much
> extra complexity. 

First three patchs apply against maint: