[ emacs ] Fixed bug in Conor colour mode
Merge branch 'emacs-colors'