# HG changeset patch
# User Eric S. Raymond <esr@snark.thyrsus.com>
# Date 734397425 0
# Node ID 9364da723c1edddcc194e7230e791ec085127549
# Parent  1142464b2ef5b206de548b3563fa7ef57b39492e
(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.

diff -r 1142464b2ef5 -r 9364da723c1e lisp/emerge.el
--- a/lisp/emerge.el	Fri Apr 09 21:53:00 1993 +0000
+++ b/lisp/emerge.el	Fri Apr 09 23:17:05 1993 +0000
@@ -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 @@
 	 (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)