There was a typo in that previous patch. Should have been regexp-quote, not regex-quote. Fixed version attached.