diff options
| -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 @@ | |||
| 3 | ;;; The author has placed this file in the public domain. | 3 | ;;; The author has placed this file in the public domain. |
| 4 | 4 | ||
| 5 | ;; Author: Dale R. Worley <drw@math.mit.edu> | 5 | ;; Author: Dale R. Worley <drw@math.mit.edu> |
| 6 | ;; Version: 4 | 6 | ;; Version: 4.1 |
| 7 | ;; Keywords: unix, tools | 7 | ;; Keywords: unix, tools |
| 8 | 8 | ||
| 9 | ;;; Commentary: | 9 | ;;; Commentary: |
| @@ -1103,8 +1103,11 @@ This is not a user option, since Emerge uses it for its own processing.") | |||
| 1103 | (if (not (string-equal agreement "1")) | 1103 | (if (not (string-equal agreement "1")) |
| 1104 | (setq list | 1104 | (setq list |
| 1105 | (cons | 1105 | (cons |
| 1106 | (let ((group-2 (emerge-get-diff3-group "2")) | 1106 | (let (group-2 group-3 pos) |
| 1107 | (group-3 (emerge-get-diff3-group "3"))) | 1107 | (setq pos (point)) |
| 1108 | (setq group-2 (emerge-get-diff3-group "2")) | ||
| 1109 | (goto-char pos) | ||
| 1110 | (setq group-3 (emerge-get-diff3-group "3")) | ||
| 1108 | (vector (car group-2) (car (cdr group-2)) | 1111 | (vector (car group-2) (car (cdr group-2)) |
| 1109 | (car group-3) (car (cdr group-3)) | 1112 | (car group-3) (car (cdr group-3)) |
| 1110 | (cond ((string-equal agreement "2") 'prefer-A) | 1113 | (cond ((string-equal agreement "2") 'prefer-A) |