From 88726de97e52deb35725221a3cea4c71e0b9feb6 Mon Sep 17 00:00:00 2001 From: moculus Date: Wed, 9 Apr 2008 02:26:17 +0000 Subject: [PATCH] regex-replace sub-group prep work --HG-- branch : pmacs2 --- method/search.py | 2 +- searchutil.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/method/search.py b/method/search.py index 8c06613..3b776f6 100644 --- a/method/search.py +++ b/method/search.py @@ -50,6 +50,6 @@ class RegexReplace(Method): def _execute(self, w, **vargs): w.application.last_replace_before = self.before = vargs['before'] w.application.last_replace_after = self.after = vargs['after'] - self.old_window = w + self.old_window = w f = lambda x: None w.application.open_mini_buffer('I-RegexReplace: ', f, self, None, 'replace') diff --git a/searchutil.py b/searchutil.py index 8695cfa..92a2383 100644 --- a/searchutil.py +++ b/searchutil.py @@ -34,7 +34,7 @@ def find_ranges(r, w, start=None, end=None): for m in r.finditer(w.buffer.lines[y], x, limit): if len(m.group(0)) == 0: raise IllegalPatternError, "zero-width match found" - ranges.append([Point(m.start(), y), Point(m.end(), y), bg_color, unselected_color]) + ranges.append([Point(m.start(), y), Point(m.end(), y), bg_color, unselected_color, m]) x = 0 y += 1 return ranges @@ -76,7 +76,7 @@ def find(r, w, move=False, direction='next', start=None, end=None): app.clear_highlighted_ranges() if newc: w.goto(newc[0]) - for (p1, p2, fg, bg) in ranges: + for (p1, p2, fg, bg, m) in ranges: if p1 < w.first: continue elif p2 > w.last: