enabled to complement a name which follows a comma
removed s:last_matchend() since matchend() is faster most often
slightly improved