Change doc:get-attr to use a pane rather than a point.

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

diff --git a/core-doc.c b/core-doc.c
index e8463b757ec685bff588ee1cb29fdb5d02e06d99..e673acd17494ca4bdc5fe82e30912c6f973f2255 100644 (file)
--- a/core-doc.c
+++ b/core-doc.c
@@ -374,7 +374,7 @@ static char *__docs_get_attr(struct doc *doc, struct mark *m,
 
 DEF_CMD(docs_get_attr)
 {
-       struct doc *doc = (*ci->pointp)->doc;
+       struct doc *doc = ci->home->data;
        struct mark *m = ci->mark;
        bool forward = ci->numeric != 0;
        char *attr = ci->str;

diff --git a/core.h b/core.h
index 87e29053982c67acdfab350abf894e99890184fb..61cd672c0f0c569a63d700f9dcebb1732b33abf0 100644 (file)
--- a/core.h
+++ b/core.h
@@ -387,15 +387,13 @@ static inline char *doc_getstr(struct pane *from, struct mark *to)
 static inline char *doc_attr(struct doc *d, struct mark *m, bool forward, char *attr)
 {
        struct cmd_info ci = {0};
-       struct point pt, *p = &pt;
 
-       pt.doc = d;
        ci.key = "doc:get-attr";
-       ci.pointp = &p;
+       ci.focus = d->home;
        ci.mark = m;
        ci.numeric = forward ? 1 : 0;
        ci.str = attr;
-       if (key_lookup(d->map, &ci) == 0)
+       if (key_handle_focus(&ci) == 0)
                return NULL;
        return ci.str2;
 }

diff --git a/doc-dir.c b/doc-dir.c
index 081156cdadad81a16b887a27de1f4c59d4687303..9e1f3b40867dceb55fcd94104502ff74c8d96863 100644 (file)
--- a/doc-dir.c
+++ b/doc-dir.c
@@ -472,7 +472,7 @@ static char *__dir_get_attr(struct doc *d, struct mark *m,
 
 DEF_CMD(dir_get_attr)
 {
-       struct doc *d = (*ci->pointp)->doc;
+       struct doc *d = ci->home->data;
        struct mark *m = ci->mark;
        bool forward = ci->numeric != 0;
        char *attr = ci->str;

diff --git a/doc-text.c b/doc-text.c
index ec5f985128e02a3ee82aaca5cb82bea696f20e03..d4461c93764f8a7dc243c75df2d4a47e7737338f 100644 (file)
--- a/doc-text.c
+++ b/doc-text.c
@@ -1466,7 +1466,7 @@ static char *__text_get_attr(struct doc *d, struct mark *m,
 
 DEF_CMD(text_get_attr)
 {
-       struct doc *d = (*ci->pointp)->doc;
+       struct doc *d = ci->home->data;
        struct mark *m = ci->mark;
        bool forward = ci->numeric != 0;
        char *attr = ci->str;