[Emacs-diffs] /srv/bzr/emacs/trunk r112656: * src/search.c (looking_at_1): Only set last_thing_searched if the match

[Stefan Monnier]

------------------------------------------------------------
revno: 112656
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14281
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-21 17:48:52 -0400
message:
  * src/search.c (looking_at_1): Only set last_thing_searched if the match
  changed the match-data.
modified:
  src/ChangeLog
  src/search.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-21 05:27:33 +0000
+++ b/src/ChangeLog     2013-05-21 21:48:52 +0000
@@ -1,3 +1,8 @@
+2013-05-21  Barry OReilly <address@hidden>
+
+       * search.c (looking_at_1): Only set last_thing_searched if the match
+       changed the match-data (bug#14281).
+
 2013-05-21  Dmitry Antipov  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'src/search.c'
--- a/src/search.c      2013-04-02 01:54:56 +0000
+++ b/src/search.c      2013-05-21 21:48:52 +0000
@@ -328,18 +328,18 @@
 
   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;
 }