Use pane rather then point to pass doc to doc:step

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

diff --git a/core-doc.c b/core-doc.c
index 1343e4f4873361dfa7a65d6ea8eb352bb8e56ca7..e8463b757ec685bff588ee1cb29fdb5d02e06d99 100644 (file)
--- a/core-doc.c
+++ b/core-doc.c
@@ -278,7 +278,7 @@ struct docs {
 
 DEF_CMD(docs_step)
 {
-       struct doc *doc = (*ci->pointp)->doc;
+       struct doc *doc = ci->home->data;
        struct mark *m = ci->mark;
        bool forward = ci->numeric;
        bool move = ci->extra;

diff --git a/core-mark.c b/core-mark.c
index 9a0f9b3f0a672bfd95c745ccbef4c1bdab2c2c50..883c539c6fa58731340a23668432361c331a5d88 100644 (file)
--- a/core-mark.c
+++ b/core-mark.c
@@ -478,15 +478,12 @@ void mark_backward_over(struct mark *m, struct mark *mp)
 
 wint_t mark_step(struct doc *d, struct mark *m, int forward, int move, struct cmd_info *ci)
 {
-       struct point p, *pt = &p;
-
-       p.doc = d;
        ci->key = "doc:step";
-       ci->pointp = &pt;
+       ci->focus = d->home;
        ci->mark = m;
        ci->numeric = forward;
        ci->extra = move;
-       key_lookup(d->map, ci);
+       key_handle_focus(ci);
        return ci->extra;
 }
 

diff --git a/doc-dir.c b/doc-dir.c
index 421c16fc3b5d3b14da1f547464d0babd9025ca4a..081156cdadad81a16b887a27de1f4c59d4687303 100644 (file)
--- a/doc-dir.c
+++ b/doc-dir.c
@@ -266,7 +266,7 @@ DEF_CMD(dir_same_file)
 
 DEF_CMD(dir_step)
 {
-       struct doc *doc = (*ci->pointp)->doc;
+       struct doc *doc = ci->home->data;
        struct mark *m = ci->mark;
        bool forward = ci->numeric;
        bool move = ci->extra;

diff --git a/doc-text.c b/doc-text.c
index 2a2efd76fbd63a854236ec7767f07f5f00c65d7d..4eaca05f62b8aac648a687f32fd7013e9618fd9d 100644 (file)
--- a/doc-text.c
+++ b/doc-text.c
@@ -963,7 +963,7 @@ static wint_t text_prev(struct text *t, struct doc_ref *r)
 
 DEF_CMD(text_step)
 {
-       struct doc *d = (*ci->pointp)->doc;
+       struct doc *d = ci->home->data;
        struct mark *m = ci->mark;
        bool forward = ci->numeric;
        bool move = ci->extra;