emacs: merlin does not fail when started on non file buffers.
emacs: the lock zone is now displayed using the margin by default.