mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-01 09:51:22 -08:00
e5e42cefd7
Make diff-apply-hunk and diff-hunk-kill independent of the point position in a diff header (Bug#17544). This change allows to apply hunks in order. It also makes possible to press M-k repeatedly to kill hunks in the order they appear in the buffer. See discussion on #Bug25105. * lisp/vc/diff-mode.el (diff-file-junk-re): Move definition before it's used. (diff--at-diff-header-p): New predicate; return non-nil when point is inside a hunk header, a file header, or within a line matching diff-file-junk-re. (diff-beginning-of-hunk): Use it. Check if the point is inside a diff header, in the middle of a hunk, or before the first hunk. (diff-apply-hunk): Call diff-beginning-of-hunk with non-nil arg before apply the hunk. (diff-hunk-kill, diff-file-kill): Call diff-beginning-of-hunk with non-nil arg after kill the hunks. (diff-post-command-hook): Call diff-beginning-of-hunk with non-nil argument. |
||
|---|---|---|
| .. | ||
| add-log.el | ||
| compare-w.el | ||
| cvs-status.el | ||
| diff-mode.el | ||
| diff.el | ||
| ediff-diff.el | ||
| ediff-help.el | ||
| ediff-hook.el | ||
| ediff-init.el | ||
| ediff-merg.el | ||
| ediff-mult.el | ||
| ediff-ptch.el | ||
| ediff-util.el | ||
| ediff-vers.el | ||
| ediff-wind.el | ||
| ediff.el | ||
| emerge.el | ||
| log-edit.el | ||
| log-view.el | ||
| pcvs-defs.el | ||
| pcvs-info.el | ||
| pcvs-parse.el | ||
| pcvs-util.el | ||
| pcvs.el | ||
| smerge-mode.el | ||
| vc-annotate.el | ||
| vc-bzr.el | ||
| vc-cvs.el | ||
| vc-dav.el | ||
| vc-dir.el | ||
| vc-dispatcher.el | ||
| vc-filewise.el | ||
| vc-git.el | ||
| vc-hg.el | ||
| vc-hooks.el | ||
| vc-mtn.el | ||
| vc-rcs.el | ||
| vc-sccs.el | ||
| vc-src.el | ||
| vc-svn.el | ||
| vc.el | ||