Drew Csillag wrote: > Diff attached. That regexp collection is already pretty hairy because of the preceding line, which is a near-duplicate. How about refactoring it as per attached untested patch instead? The idea is to surround the entire keyword with \(...\), so that the matching regexp is of the form \(\(m4_\)?\(keyword1\|keyword2\|...\)\).