diff options
author | Miles Bader <miles@gnu.org> | 2000-09-20 06:41:26 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2000-09-20 06:41:26 +0000 |
commit | 0415d0d076e99e163a9e611c0c6d26df420ba539 (patch) | |
tree | b3a21b417026f573c1969691f240e22bc3ae8167 /lisp/diff-mode.el | |
parent | 523b128cff09d99187a026ccf4bbd6d075b8602f (diff) | |
download | emacs-0415d0d076e99e163a9e611c0c6d26df420ba539.tar.gz |
(diff-apply-hunk): Jump to the correct line offset in the dry-run case.
Diffstat (limited to 'lisp/diff-mode.el')
-rw-r--r-- | lisp/diff-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index af8535ad79f..b36500840ce 100644 --- 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 |