Sorry for answering my own mail here.

This is the fix I used (and that works fine):



<sh:/home/sebastian/emacs-CVS/emacs> cvs diff src/ftfont.c