[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2958e52: Fix selective diff browsing in Ediff
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 2958e52: Fix selective diff browsing in Ediff |
Date: |
Thu, 14 May 2015 15:25:14 +0000 |
branch: master
commit 2958e5237c6ee57378f1b47217aafd0b21ec86ab
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 62a0d9d..260366e 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2958e52: Fix selective diff browsing in Ediff,
Eli Zaretskii <=