diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 1993-04-09 23:17:05 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 1993-04-09 23:17:05 +0000 |
| commit | f3613f5bb58f5cfccb0221143381ffd2f67791f0 (patch) | |
| tree | f54ebf9a29612f184ea66fe3d9847d5e016440e5 /lisp/emerge.el | |
| parent | f449890c0caa599894092956a25302a336715fc8 (diff) | |
| download | emacs-f3613f5bb58f5cfccb0221143381ffd2f67791f0.tar.gz | |
(emerge-with-ancestor): Applied Donald Erway's fix patch, which
included the following explanatory comment: "D.Erway - This used to
just do emerge-get-diff3-group on 2, then on 3. This was incorrect,
since the file 3 info for a diff can preceed the file 2 info for that
same diff. So we save and restore point to overcome this.
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index c0efed32175..77eac433200 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -3,7 +3,7 @@ ;;; The author has placed this file in the public domain. ;; Author: Dale R. Worley <drw@math.mit.edu> -;; Version: 4 +;; Version: 4.1 ;; Keywords: unix, tools ;;; Commentary: @@ -1103,8 +1103,11 @@ This is not a user option, since Emerge uses it for its own processing.") (if (not (string-equal agreement "1")) (setq list (cons - (let ((group-2 (emerge-get-diff3-group "2")) - (group-3 (emerge-get-diff3-group "3"))) + (let (group-2 group-3 pos) + (setq pos (point)) + (setq group-2 (emerge-get-diff3-group "2")) + (goto-char pos) + (setq group-3 (emerge-get-diff3-group "3")) (vector (car group-2) (car (cdr group-2)) (car group-3) (car (cdr group-3)) (cond ((string-equal agreement "2") 'prefer-A) |