mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/progmodes/f90.el (f90-blocks-re): Include the terminating \> in the

Browse source 
surrounding group.
* src/regex.c (regex_compile) [\=, \>, \<]: Don't forget to set laststart.

Fixes: debbugs:14402
This commit is contained in:
Stefan Monnier 2013-05-14 20:52:07 -04:00
parent 180ed21842
commit 5ac2eb344f
4 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,8 +1,12 @@
2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
* regex.c (regex_compile) [\=, \>, \<]: Don't forget to set laststart.
2013-05-14 Eli Zaretskii <eliz@gnu.org>
* w32fns.c (w32_wnd_proc): Don't call WINDOW_HEADER_LINE_HEIGHT
unless we know that the window w is a leaf window. Another
attempt at solving bug#14062.
unless we know that the window w is a leaf window.
Another attempt at solving bug#14062.
2013-05-14 Jan Djärv <jan.h.d@swipnet.se>

9
src/regex.c
View file

@ -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;