1 files changed, 6 insertions, 3 deletions

diff --git a/src/regex.c b/src/regex.c
index 83d80b5aaa9..04429386f84 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2622,7 +2622,7 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct
             goto normal_char;
         handle_plus:
         case '*':
-          /* If there is no previous pattern... */
+          /* If there is no previous pattern...  */
           if (!laststart)
             {
               if (syntax & RE_CONTEXT_INVALID_OPS)
@@ -2730,7 +2730,7 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct
                   }
               }
             else                /* not greedy */
-              { /* I wish the greedy and non-greedy cases could be merged. */
+              { /* I wish the greedy and non-greedy cases could be merged.  */
 
                 GET_BUFFER_SPACE (7); /* We might use less.  */
                 if (many_times_ok)
@@ -3034,7 +3034,7 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct
 
                 /* Allocate space for COUNT + RANGE_TABLE.  Needs two
                    bytes for flags, two for COUNT, and three bytes for
-                   each character. */
+                   each character.  */
                 GET_BUFFER_SPACE (4 + used * 3);
 
                 /* Indicate the existence of range table.  */
@@ -3461,6 +3461,7 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct
             /* There is no way to specify the before_dot and after_dot
                operators.  rms says this is ok.  --karl  */
             case '=':
+              laststart = b;
               BUF_PUSH (at_dot);
               break;
 
@@ -3509,12 +3510,14 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct
             case '<':
               if (syntax & RE_NO_GNU_OPS)
                 goto normal_char;
+              laststart = b;
               BUF_PUSH (wordbeg);
               break;
 
             case '>':
               if (syntax & RE_NO_GNU_OPS)
                 goto normal_char;
+              laststart = b;
               BUF_PUSH (wordend);
               break;