Commit 0415d0d0 authored by Miles Bader's avatar Miles Bader
Browse files

(diff-apply-hunk): Jump to the correct line offset in the dry-run case.

parent 523b128c
2000-09-20 Miles Bader <miles@lsi.nec.co.jp>
* diff-mode.el (diff-apply-hunk): Jump to the correct line offset
in the dry-run case.
* jka-compr.el (with-auto-compression-mode): New macro.
* cus-edit.el (custom-face-tag-face, custom-group-tag-face-1)
......
......@@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: patch diff
;; Revision: $Id: diff-mode.el,v 1.16 2000/09/19 16:24:30 monnier Exp $
;; Revision: $Id: diff-mode.el,v 1.17 2000/09/19 16:25:43 monnier Exp $
;; This file is part of GNU Emacs.
......@@ -1085,7 +1085,7 @@ was non-nil."
;; fixup POS to reflect the hunk line offset
(goto-char pos)
(forward-line (cdr new))
(forward-line (cdr (if dry-run old new)))
(setq pos (point)))
;; Display BUF in a window, and maybe select it
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment