[AC 21.5] Fix merge and font-lock problems
This fixes the font-lock and and another merge problem in 21.5. There is
still a crash when you try and bring up the search dialog, but that looks
more to do with ben's redisplay changes. I may be wrong - it may just be
that it doesn't show up under 21.4.
andy
Attachments:
- merge.patch (application/octet-stream — 2.5 KB)