Merge pull request #803 from vitoshka/master

fix error message on missing source location
[Fix #749] Replace a few more 'face references with 'font-lock-face