aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff-mode.el (follow)
Commit message (Collapse)AuthorAgeFilesLines
* (diff-font-lock-keywords, diff-hunk-header-re)Stefan Monnier2000-06-051-10/+23
| | | | | | (diff-goto-source, diff-unified->context, diff-context->unified) (diff-reverse-direction, diff-fixup-modifs): Fix the regexps to understand the format output by the `-p' argument to diff.
* (diff-font-lock-keywords): Recognize comments.Stefan Monnier2000-05-101-27/+44
| | | | | | | | (diff-font-lock-defaults): Explicitly turn off multiline. (diff-end-of-hunk): Handle comments and fix end-of-buffer bug. (diff-ediff-patch): Fix call to ediff-patch-file. (diff-end-of-file, diff-reverse-direction, diff-fixup-modifs): Handle comments.
* (diff-mode-*-map): use `easy-mmode-defmap'.Stefan Monnier2000-03-211-95/+43
| | | | | | | | | | | | (diff-end-of-hunk): Return the end position for use in `easy-mmode-define-navigation'. (diff-recenter): Remove. (diff-(next|prev)-*): Rename `diff-*-(prev|next)' and defined in terms of `easy-mmode-define-navigation'. (diff-kill-*): Rename `diff-*-kill' (for consistency with the previous renaming) and fix to use new names. (diff-merge-strings): Use \n as separator: simpler, faster. (diff-mode): Use `define-derived-mode'.
* (diff-kill-junk): New interactive function.Stefan Monnier2000-02-071-18/+53
| | | | | | | | (diff-reverse-direction): Use delete-and-extract-region. (diff-post-command-hook): Restrict the area so that the hook also works outside of any diff hunk. This is necessary for the minor-mode. (diff-mode): Use toggle-read-only and minor-mode-overriding-map-alist. (diff-minor-mode): Setup the hooks for header-hunk rewriting.
* * diff-mode.el (diff-mode-shared-map): fset'd and doc change.Stefan Monnier1999-12-071-33/+93
| | | | | | | | | | | (diff-minor-mode, diff-minor-mode-prefix, diff-minor-mode-map): New code to support the minor mode version. (diff-recenter): New function. (diff-next-hunk, diff-next-file): Use it. (diff-remembered-files-alist): New var. (diff-merge-strings): New function. (diff-find-file-name): Make it smarter and use the user's input more. (diff-mode): Cosmetic changes.
* (diff-find-file-name): use `Index:' preferentially.Stefan Monnier1999-10-131-4/+6
|
* (vc-backend-diff): get rid of the autoloaded advice.Stefan Monnier1999-10-111-13/+0
|
* Initial revision, known outside of Emacs as version 1.8.Stefan Monnier1999-10-091-0/+855