diff-mode

Homepage: https://www.gnu.org/software/emacs

Author: Stefan Monnier

Summary

A mode for viewing/editing context diffs

Commentary

Provides support for font-lock, outline, navigation
commands, editing and various conversions as well as jumping
to the corresponding source file.

Inspired by Pavel Machek's patch-mode.el ()
Some efforts were spent to have it somewhat compatible with XEmacs's
diff-mode as well as with compilation-minor-mode

Bugs:

- Reverse doesn't work with normal diffs.

Todo:

- Improve `diff-add-change-log-entries-other-window',
  it is very simplistic now.

- Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
  Also allow C-c C-a to delete already-applied hunks.

- Try `diff  ' to try and fuzzily discover the source location
  of a hunk.  Show then the changes between  and  and make it
  possible to apply them to , , or .
  Or maybe just make it into a ".rej to diff3-markers converter".
  Maybe just use `wiggle' (by Neil Brown) to do it for us.

- in diff-apply-hunk, strip context in replace-match to better
  preserve markers and spacing.
- Handle `diff -b' output in context->unified.

Dependencies

• cl-lib
• smerge-mode
• subr-x

Reverse dependencies

• dvc
• fsvn
• compare-w
• smerge-mode
• vc
• psvn
• circe
• diff-hl
• egg
• ensime
• find-file-in-project
• homebrew-mode
• magit
• p4
• snapshot-timemachine
• vdiff
• company-coq
• ycmd
• ediff
• notmuch
• evil-collection
• rigid-tabs
• vc-hgcmd
• e2ansi
• proof-general
• evil-traces
• diff-at-point
• ahg
• diffscuss-mode
• elpy
• debbugs
• direnv
• message-view-patch
• chezmoi
• diffsync