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 4f2f1ffcbb8839a94bfdd51d68c4b96adf2e9408..adb6fa7dbec8ecca4b10a6807d8f260d2b3052ea 100644 (file)
--- 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 73516b4686330e394dec487d9e36e2edea348e93..a46d2d2ce39c30336957bb06bbb07b5a85df73ba 100644 (file)
--- 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 92ac80a11c0e43fbc5fb63e37da68fc69d7e10ac..c052937b710ded0dc00458e9e79e7b10d642a58f 100644 (file)
--- 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)