# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 740094274 0
# Node ID 60292a8697bce46d8e6eed84f9094552250411fa
# Parent  ca1e006fff42de1a40c46dce449757a0238503d0
(emerge-make-diff3-list): Pass ancestor second.
(emerge-extract-diffs3): Replace group-1 with group-2.
(emerge-handle-local-variables): Pass no arg to hack-local-variables.

diff -r ca1e006fff42 -r 60292a8697bc lisp/emerge.el
--- a/lisp/emerge.el	Mon Jun 14 18:55:10 1993 +0000
+++ b/lisp/emerge.el	Mon Jun 14 21:44:34 1993 +0000
@@ -653,8 +653,8 @@
    (shell-command
     (format "%s %s %s %s %s"
 	    emerge-diff3-program emerge-diff-options
+	    (emerge-protect-metachars file-A)
 	    (emerge-protect-metachars file-ancestor)
-	    (emerge-protect-metachars file-A)
 	    (emerge-protect-metachars file-B))
     t))
   (emerge-prepare-error-list emerge-diff3-ok-lines-regexp)
@@ -671,17 +671,17 @@
        (beginning-of-line 2)
        (let ((agreement (buffer-substring (match-beginning 1) (match-end 1))))
 	 ;; if the A and B files are the same, ignore the difference
-	 (if (not (string-equal agreement "1"))
+	 (if (not (string-equal agreement "2"))
 	     (setq list
 		   (cons 
-		    (let (group-2 group-3 pos)
+		    (let (group-1 group-3 pos)
 		      (setq pos (point))
-		      (setq group-2 (emerge-get-diff3-group "2"))
+		      (setq group-1 (emerge-get-diff3-group "1"))
 		      (goto-char pos)
 		      (setq group-3 (emerge-get-diff3-group "3"))
-		      (vector (car group-2) (car (cdr group-2))
+		      (vector (car group-1) (car (cdr group-1))
 			      (car group-3) (car (cdr group-3))
-			      (cond ((string-equal agreement "2") 'prefer-A)
+			      (cond ((string-equal agreement "1") 'prefer-A)
 				    ((string-equal agreement "3") 'prefer-B)
 				    (t 'default-A))))
 		    list))))))
@@ -1374,7 +1374,7 @@
 (defun emerge-handle-local-variables ()
   (if emerge-process-local-variables
       (condition-case err
-	  (hack-local-variables t)
+	  (hack-local-variables)
 	(error (message "Local-variables error in merge buffer: %s"
 			(prin1-to-string err))))))