[sr-dev] git:master:754d57f9: Merge pull request #2192 from jamesaimonetti/emacs-compat