File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed
Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -3109,15 +3109,25 @@ peekchr()
31093109 if (reg_magic >= MAGIC_OFF )
31103110 {
31113111 char_u * p = regparse + 1 ;
3112+ int is_magic_all = (reg_magic == MAGIC_ALL );
31123113
3113- /* ignore \c \C \m and \M after '$' */
3114+ /* ignore \c \C \m \M \v \V and \Z after '$' */
31143115 while (p [0 ] == '\\' && (p [1 ] == 'c' || p [1 ] == 'C'
3115- || p [1 ] == 'm' || p [1 ] == 'M' || p [1 ] == 'Z' ))
3116+ || p [1 ] == 'm' || p [1 ] == 'M'
3117+ || p [1 ] == 'v' || p [1 ] == 'V' || p [1 ] == 'Z' ))
3118+ {
3119+ if (p [1 ] == 'v' )
3120+ is_magic_all = TRUE;
3121+ else if (p [1 ] == 'm' || p [1 ] == 'M' || p [1 ] == 'V' )
3122+ is_magic_all = FALSE;
31163123 p += 2 ;
3124+ }
31173125 if (p [0 ] == NUL
31183126 || (p [0 ] == '\\'
31193127 && (p [1 ] == '|' || p [1 ] == '&' || p [1 ] == ')'
31203128 || p [1 ] == 'n' ))
3129+ || (is_magic_all
3130+ && (p [0 ] == '|' || p [0 ] == '&' || p [0 ] == ')' ))
31213131 || reg_magic == MAGIC_ALL )
31223132 curchr = Magic ('$' );
31233133 }
Original file line number Diff line number Diff line change @@ -734,6 +734,8 @@ static char *(features[]) =
734734
735735static int included_patches [] =
736736{ /* Add new patch number below this line */
737+ /**/
738+ 360 ,
737739/**/
738740 359 ,
739741/**/
You can’t perform that action at this time.
0 commit comments