adjust to changes in with-editor, git-commit-mode and git-rebase-mode

Also see https://github.com/magit/git-modes/pull/89