diff mode in emacs state, consolidate magit bindings