2 files changed, 26 insertions, 9 deletions

diff --git a/editors/awk.c b/editors/awk.c
index d1fedb572..76385f33b 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -272,7 +272,8 @@ typedef struct tsplitter_s {
 /* if previous token class is CONCAT1 and next is CONCAT2, concatenation */
 /* operator is inserted between them */
 #define TC_CONCAT1 (TC_VARIABLE | TC_ARRTERM | TC_SEQTERM \
-                   | TC_STRING | TC_NUMBER | TC_UOPPOST)
+                   | TC_STRING | TC_NUMBER | TC_UOPPOST \
+                   | TC_LENGTH)
 #define TC_CONCAT2 (TC_OPERAND | TC_UOPPRE)
 
 #define OF_RES1     0x010000
@@ -1074,8 +1075,10 @@ static uint32_t next_token(uint32_t expected)
         const uint32_t *ti;
 
         if (t_rollback) {
+                debug_printf_parse("%s: using rolled-back token\n", __func__);
                 t_rollback = FALSE;
         } else if (concat_inserted) {
+                debug_printf_parse("%s: using concat-inserted token\n", __func__);
                 concat_inserted = FALSE;
                 t_tclass = save_tclass;
                 t_info = save_info;
@@ -1204,7 +1207,11 @@ static uint32_t next_token(uint32_t expected)
                         goto readnext;
 
                 /* insert concatenation operator when needed */
-                if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & TC_BINOP)) {
+                debug_printf_parse("%s: %x %x %x concat_inserted?\n", __func__,
+                        (ltclass & TC_CONCAT1), (tc & TC_CONCAT2), (expected & TC_BINOP));
+                if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & TC_BINOP)
+                 && !(ltclass == TC_LENGTH && tc == TC_SEQSTART) /* but not for "length(..." */
+                ) {
                         concat_inserted = TRUE;
                         save_tclass = tc;
                         save_info = t_info;
@@ -1212,6 +1219,7 @@ static uint32_t next_token(uint32_t expected)
                         t_info = OC_CONCAT | SS | P(35);
                 }
 
+                debug_printf_parse("%s: t_tclass=tc=%x\n", __func__, t_tclass);
                 t_tclass = tc;
         }
         ltclass = t_tclass;
@@ -1222,6 +1230,7 @@ static uint32_t next_token(uint32_t expected)
                                 EMSG_UNEXP_EOS : EMSG_UNEXP_TOKEN);
         }
 
+        debug_printf_parse("%s: returning, ltclass:%x t_double:%f\n", __func__, ltclass, t_double);
         return ltclass;
 #undef concat_inserted
 #undef save_tclass
@@ -1286,7 +1295,7 @@ static node *parse_expr(uint32_t iexp)
                         glptr = NULL;
 
                 } else if (tc & (TC_BINOP | TC_UOPPOST)) {
-                        debug_printf_parse("%s: TC_BINOP | TC_UOPPOST\n", __func__);
+                        debug_printf_parse("%s: TC_BINOP | TC_UOPPOST tc:%x\n", __func__, tc);
                         /* for binary and postfix-unary operators, jump back over
                          * previous operators with higher priority */
                         vn = cn;
@@ -1391,7 +1400,12 @@ static node *parse_expr(uint32_t iexp)
 
                                 case TC_LENGTH:
                                         debug_printf_parse("%s: TC_LENGTH\n", __func__);
-                                        next_token(TC_SEQSTART | TC_OPTERM | TC_GRPTERM);
+                                        next_token(TC_SEQSTART /* length(...) */
+                                                | TC_OPTERM    /* length; (or newline)*/
+                                                | TC_GRPTERM   /* length } */
+                                                | TC_BINOPX    /* length <op> NUM */
+                                                | TC_COMMA     /* print length, 1 */
+                                        );
                                         rollback_token();
                                         if (t_tclass & TC_SEQSTART) {
                                                 /* It was a "(" token. Handle just like TC_BUILTIN */
diff --git a/editors/vi.c b/editors/vi.c
index 948b95ae6..131c018a2 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2317,7 +2317,6 @@ static char *get_one_address(char *p, int *addr)	// get colon addr, if present
         int st;
         char *q;
         IF_FEATURE_VI_YANKMARK(char c;)
-        IF_FEATURE_VI_SEARCH(char *pat;)
 
         *addr = -1;                     // assume no addr
         if (*p == '.') {        // the current line
@@ -2342,16 +2341,20 @@ static char *get_one_address(char *p, int *addr)	// get colon addr, if present
 #endif
 #if ENABLE_FEATURE_VI_SEARCH
         else if (*p == '/') {   // a search pattern
-                q = strchrnul(++p, '/');
-                pat = xstrndup(p, q - p); // save copy of pattern
+                q = strchrnul(p + 1, '/');
+                if (p + 1 != q) {
+                        // save copy of new pattern
+                        free(last_search_pattern);
+                        last_search_pattern = xstrndup(p, q - p);
+                }
                 p = q;
                 if (*p == '/')
                         p++;
-                q = char_search(dot, pat, (FORWARD << 1) | FULL);
+                q = char_search(next_line(dot), last_search_pattern + 1,
+                                                (FORWARD << 1) | FULL);
                 if (q != NULL) {
                         *addr = count_lines(text, q);
                 }
-                free(pat);
         }
 #endif
         else if (*p == '$') {   // the last line in file