mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-28 01:00:52 -07:00
Code Issues Projects Releases Wiki Activity

* src/search.c (looking_at_1): Only set last_thing_searched if the match

Browse source 
changed the match-data.

Fixes: debbugs:14281
This commit is contained in:
Stefan Monnier 2013-05-21 17:48:52 -04:00
parent c2d41179e1
commit fc30d803f4
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-05-21 Barry OReilly <gundaetiapo@gmail.com>
* search.c (looking_at_1): Only set last_thing_searched if the match
changed the match-data (bug#14281).
2013-05-21 Dmitry Antipov <dmantipov@yandex.ru>
* xdisp.c (reseat_at_previous_visible_line_start):
@ -8,8 +13,8 @@
* xfns.c (check_x_display_info): Don't use XINT for terminal object.
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_mm_width, Fx_display_mm_height): Mention
`display-monitor-attributes-list' in docstrings.
(Fx_display_mm_width, Fx_display_mm_height):
Mention `display-monitor-attributes-list' in docstrings.
* nsfns.m (ns_get_screen): Remove function. All uses removed.
(check_ns_display_info): Sync with check_x_display_info in xfns.c.
@ -25,8 +30,8 @@
(Fx_display_pixel_width, Fx_display_pixel_width): Return width or
height for all physical monitors as in X11.
* nsterm.m (x_display_pixel_width, x_display_pixel_height): Return
pixel width or height for all physical monitors as in X11.
* nsterm.m (x_display_pixel_width, x_display_pixel_height):
Return pixel width or height for all physical monitors as in X11.
2013-05-18 Paul Eggert <eggert@cs.ucla.edu>

12
src/search.c
View file

@ -328,18 +328,18 @@ looking_at_1 (Lisp_Object string, bool posix)
val = (i >= 0 ? Qt : Qnil);
if (NILP (Vinhibit_changing_match_data) && i >= 0)
{
for (i = 0; i < search_regs.num_regs; i++)
if (search_regs.start[i] >= 0)
{
search_regs.start[i]
= BYTE_TO_CHAR (search_regs.start[i] + BEGV_BYTE);
search_regs.end[i]
= BYTE_TO_CHAR (search_regs.end[i] + BEGV_BYTE);
}
/* Set last_thing_searched only when match data is changed. */
if (NILP (Vinhibit_changing_match_data))
search_regs.end[i]
= BYTE_TO_CHAR (search_regs.end[i] + BEGV_BYTE);
}
/* Set last_thing_searched only when match data is changed. */
XSETBUFFER (last_thing_searched, current_buffer);
}
return val;
}