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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b5a92b0d5606f0e8e88483e92b2a86a5debe744..12bfd8907b56981f0a7d391c61f3e77ee2a0015c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 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)

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index af8535ad79ff74966d2dd57fb4e8eb33ea619c12..b36500840ce809b427c1949010b79d8fa91f21d9 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -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