Fix various doc:char handlers when stepped towards a mark.

I obviously never tested this - the condition was inverted.

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

diff --git a/core-log.c b/core-log.c
index 6737ff539d63cc200ecdebb240de8e6d706a2d5d..09dd4099470b3a56d98d65daf206f8fdf70635b0 100644 (file)
--- a/core-log.c
+++ b/core-log.c
@@ -318,7 +318,7 @@ DEF_CMD(log_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = log_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/doc-dir.c b/doc-dir.c
index 58b26a9a7f6a3afa3c315fc0816c2b7053c60bde..f09fbfdb01a9bf972d7cc5bc5c306a7d8a2f44a4 100644 (file)
--- a/doc-dir.c
+++ b/doc-dir.c
@@ -442,7 +442,7 @@ DEF_CMD(dir_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = dir_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/doc-docs.c b/doc-docs.c
index ae19c2aa507d98bb3bd623b58efb06e907e7d8da..38620f9440c7ae24561d76e99d90b913cea8fccc 100644 (file)
--- a/doc-docs.c
+++ b/doc-docs.c
@@ -507,7 +507,7 @@ DEF_CMD(docs_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = docs_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/doc-email.c b/doc-email.c
index f9648f9a8a585bb7ef70e53ae83a70c517b29447..b1c82a01ea4bfaa60983703ecc2dec6fad0ec054 100644 (file)
--- a/doc-email.c
+++ b/doc-email.c
@@ -946,7 +946,7 @@ DEF_CMD(email_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = email_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/doc-multipart.c b/doc-multipart.c
index 6f8a3fb8c8d66d691fb1dc3d59e233bf896f0a0f..735a8f1e7b4bfa37d5b7abbaba3dbe3ceaa9d43a 100644 (file)
--- a/doc-multipart.c
+++ b/doc-multipart.c
@@ -369,7 +369,7 @@ DEF_CMD(mp_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = mp_step(ci->home, m, forward, 1, ci->str);
                steps -= forward*2 - 1;
        }

diff --git a/doc-text.c b/doc-text.c
index 7da3748563e51269949d91d457b92f4094063eeb..328cc4888df0495a7ab3b61379a25a1db4a5ad1d 100644 (file)
--- a/doc-text.c
+++ b/doc-text.c
@@ -1685,7 +1685,7 @@ DEF_CMD(text_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = text_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }
@@ -1744,7 +1744,7 @@ DEF_CMD(text_byte)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = text_step_bytes(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/lib-base64.c b/lib-base64.c
index 9f7af1fe7f6d32bdce3bdd0ba66697002edd5424..3b19333fb3cf5b971778e7f36cf796a171cd6bd3 100644 (file)
--- a/lib-base64.c
+++ b/lib-base64.c
@@ -201,7 +201,7 @@ DEF_CMD(base64_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = base64_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/lib-crop.c b/lib-crop.c
index 09f00c145131dbe7261f74eb688ff8d29e78a81f..dae03726a758bc53fb968d5c35c2e598807bcc14 100644 (file)
--- a/lib-crop.c
+++ b/lib-crop.c
@@ -119,7 +119,7 @@ DEF_CMD(crop_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = crop_step(ci->home, m, forward, 1, ci->key);
                steps -= forward*2 - 1;
        }

diff --git a/lib-qprint.c b/lib-qprint.c
index e220b41396dbb4eed88a1af9e210ff039f969483..cedecc6231d3cc456947727ab5153553540d81c4 100644 (file)
--- a/lib-qprint.c
+++ b/lib-qprint.c
@@ -202,7 +202,7 @@ DEF_CMD(qp_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = qp_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/lib-utf8.c b/lib-utf8.c
index b13f64aea91cf2e6ab62fa087752bf618660f6e9..ccfa55dd70602aee131abb7c4ea394e94037e96d 100644 (file)
--- a/lib-utf8.c
+++ b/lib-utf8.c
@@ -81,7 +81,7 @@ DEF_CMD(utf8_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = utf8_step(ci->home, m, forward, 1);
                steps -= forward*2 - 1;
        }

diff --git a/render-format.c b/render-format.c
index 5fe16ce53796ec490388eaa5d6e22ae0338397d6..9f4455acf7edd447bac6d85e09bd696665805095 100644 (file)
--- a/render-format.c
+++ b/render-format.c
@@ -632,7 +632,7 @@ DEF_CMD(format_char)
        if (end && (end->seq < m->seq) != (steps < 0))
                /* Can never cross 'end' */
                return Einval;
-       while (steps && ret != CHAR_RET(WEOF) && (!end || mark_same(m, end))) {
+       while (steps && ret != CHAR_RET(WEOF) && (!end || !mark_same(m, end))) {
                ret = format_step(ci->home, ci->focus, m, forward, 1);
                steps -= forward*2 - 1;
        }