This is precisely what I do religiously in my latex: M-dashes are always {\,---\,}