From 2958e5237c6ee57378f1b47217aafd0b21ec86ab Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 14 May 2015 18:24:19 +0300 Subject: [PATCH] Fix selective diff browsing in Ediff * lisp/vc/ediff-util.el (ediff-focus-on-regexp-matches): Go to the beginning of the region before searching for the ediff-regexp-focus-* regexps. (Bug#20568) --- lisp/vc/ediff-util.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 62a0d9da0ab..260366e242a 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -2318,6 +2318,7 @@ the number seen by the user." (narrow-to-region (ediff-get-diff-posn 'B 'beg n ctl-buf) (ediff-get-diff-posn 'B 'end n ctl-buf)) + (goto-char (point-min)) (re-search-forward regex-B nil t)))) (reg-C-match (if ediff-3way-comparison-job (ediff-with-current-buffer ediff-buffer-C @@ -2325,6 +2326,7 @@ the number seen by the user." (narrow-to-region (ediff-get-diff-posn 'C 'beg n ctl-buf) (ediff-get-diff-posn 'C 'end n ctl-buf)) + (goto-char (point-min)) (re-search-forward regex-C nil t)))))) (not (eval (if ediff-3way-comparison-job (list ediff-focus-regexp-connective -- 2.39.5