; Revert "Improve diff-mode navigation/manipulation"