Merge pull request #337 from Haroogan/master

emacs: Fix for the `emacs-24` branch
conemu: Updates and fixes