search: fix but with dot matching newlines.

Also default to case-insensitive until I get that configurable.

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

diff --git a/lib-search.c b/lib-search.c
index 0a0789ebdf4bd1c2f586429ac05728ca9d66c586..26d3a287dd2076ae929c4c5dba1ababc5db2c848 100644 (file)
--- a/lib-search.c
+++ b/lib-search.c
@@ -27,7 +27,7 @@ DEF_CMD(text_search)
        if (!d)
                return -1;
        m = ci->mark;
-       rxl = rxl_parse(ci->str, NULL, 0);
+       rxl = rxl_parse(ci->str, NULL, 1);
        if (!rxl)
                return -1;
        st = rxl_prepare(rxl);

diff --git a/rexel.c b/rexel.c
index 88c4daaae7c6732df2df633922943953d2d8043c..a1e7d471e2f2a085459c03f13ecb2b45ddc66057 100644 (file)
--- a/rexel.c
+++ b/rexel.c
@@ -392,7 +392,7 @@ int rxl_advance(struct match_state *st, wint_t ch, int flag, int restart)
                                advance = 1;
                                if ((ch == '\n' || ch == '\r' || ch == '\f')
                                    && !RXL_IS_DOTALL(st->rxl))
-                                       advance = 0;
+                                       advance = -1;
                                break;
                        case REC_MATCH:
                                /* cannot match more chars here */