diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-05-14 18:24:19 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-05-14 18:24:19 +0300 |
| commit | 2958e5237c6ee57378f1b47217aafd0b21ec86ab (patch) | |
| tree | 106db973f0e7343deb9d8016b67f5b961c1075ce /lisp/vc/ediff-util.el | |
| parent | f2c4fd224119fe0dc975aa7e37fc27093d7e3225 (diff) | |
| download | emacs-2958e5237c6ee57378f1b47217aafd0b21ec86ab.tar.gz | |
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)
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | 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 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 |