It's good to see that some people are using the diff files to patch up. Markus> Martin Buchholz wrote: Markus> [snip] >> I've uploaded a fixed patch file. Markus> It looks like the fixed patch file is still not ok. I had problems Markus> applying it with "applypatch" and found that it contains two diffs to Markus> files which have been deleted in 21.2.45, namely lib-src/aixcc.lex and Markus> src/dump-id.h: Markus> diff --text -u /dev/null 'xemacs-21.2.46/lib-src/aixcc.lex' Markus> Index: ./lib-src/aixcc.lex Markus> --- ./lib-src/aixcc.lex Thu Jan 1 09:00:00 1970 Markus> +++ ./lib-src/aixcc.lex Fri Mar 9 13:12:50 2001 Markus> ＠＠ -0,0 +1,0 ＠＠ Markus> diff --text -u /dev/null 'xemacs-21.2.46/src/dump-id.h' Markus> Index: ./src/dump-id.h Markus> --- ./src/dump-id.h Thu Jan 1 09:00:00 1970 Markus> +++ ./src/dump-id.h Fri Mar 9 13:13:11 2001 Markus> ＠＠ -0,0 +1,0 ＠＠ Markus> That's where "applypatch" exits. Removing those difference hunks and Markus> patching with "applypatch -force" works, BTW. Markus> Is it correct that these diffs are in the patch file? Somehow, the GTK merge has brought the two ghosts aixcc.lex and dump-id.h back to life as 0-length files, which is wrong - another bug introduced by the GTK merge. Stephen, you'll want to `cvs rm' these files. I think makepatch has a bug when generating a patch for a file that formerly did not exist, and now is zero-length. I don't recommend that we try to work around this bug permanently, but fix up the patch file manually to remove the references to the problematic files.

I've uploaded a new patch file created using my patched makepatch. But I haven't actually tested it to make sure it works. Martin