improve regexp for font-lock-keywords.
Merge improved regexp for font-lock-keywords by lurdan