From: NeilBrown <neil@brown.name>
Date: Thu, 10 Dec 2015 00:52:00 +0000 (+1100)
Subject: Remove mark_same calls from non-core/doc code.
X-Git-Tag: lca2016~86
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=d6669e612508d04c9526a1178b407e3294998dd9;p=edlib.git

Remove mark_same calls from non-core/doc code.

These should use mark_same_pane.

Signed-off-by: NeilBrown <neil@brown.name>
---

diff --git a/emacs-search.c b/emacs-search.c
index 4f2f1ffc..adb6fa7d 100644
--- a/emacs-search.c
+++ b/emacs-search.c
@@ -52,7 +52,7 @@ DEF_CMD(search_forward)
 	if (!d)
 		return -1;
 
-	if (esi->s && mark_same(d, esi->s->m, esi->end)) {
+	if (esi->s && mark_same_pane(esi->target, esi->s->m, esi->end, NULL)) {
 		/* already pushed and didn't find anything new */
 		return 1;
 	}
diff --git a/render-format.c b/render-format.c
index 73516b46..a46d2d2c 100644
--- a/render-format.c
+++ b/render-format.c
@@ -37,7 +37,7 @@ DEF_CMD(render_line)
 	if (!d || !ci->mark)
 		return -1;
 
-	if (pm && !mark_same(d, pm, m))
+	if (pm && !mark_same_pane(ci->home, pm, m, NULL))
 		pm = NULL;
 	ch = doc_following(d, m);
 	if (ch == WEOF)
diff --git a/render-hex.c b/render-hex.c
index 92ac80a1..c052937b 100644
--- a/render-hex.c
+++ b/render-hex.c
@@ -148,7 +148,7 @@ DEF_CMD(render_line)
 		wint_t ch;
 		struct mark *m2 = ci->mark;
 
-		if (pm && mark_same(d, m2, pm))
+		if (pm && mark_same_pane(ci->home, m2, pm, NULL))
 			goto done;
 		if (ci->numeric >= 0 && ci->numeric != NO_NUMERIC &&
 		    ci->numeric <= ret.len)