From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 14 May 2015 15:24:19 +0000 (+0300)
Subject: Fix selective diff browsing in Ediff
X-Git-Tag: emacs-25.0.90~2097
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2958e5237c6ee57378f1b47217aafd0b21ec86ab;p=emacs.git

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)
---

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