> The correct form surely is
> 
>     (cond ((memq (window-system frame) '(x mac w32 ns))

There are some more inconsistencies here.  Does the attached patch DTRT?