(trivial_regexp_p): Catch \{N,M\} as well.

diff --git a/src/ChangeLog b/src/ChangeLog
index ef8f02d95fcf48f9875bf2d73990550fa4beb08e..4ab3a98d9a900de54bc01f2d7e826cc91593e336 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * search.c (trivial_regexp_p): Catch \{N,M\} as well.
+
 2001-09-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * Makefile.in (shortlisp): Resync with loadup.el: add backquote,
@@ -32,23 +36,22 @@
        (try_scrolling, try_cursor_movement, redisplay_window): Give up on
        this round of redisplay if make_cursor_line_fully_visible fails.
        (CURSOR_MOVEMENT_*, SCROLLING_*): New enumerators.
-       (try_cursor_movement, try_scrolling): Use them instead of
-       integers.
+       (try_cursor_movement, try_scrolling): Use them instead of integers.
 
        * dispextern.h (required_matrix_width, required_matrix_height):
        Add prototypes.
 
-       * dispnew.c (required_matrix_width, required_matrix_height): New
-       functions.
+       * dispnew.c (required_matrix_width, required_matrix_height):
+       New functions.
        (allocate_matrices_for_window_redisplay)
-       (allocate_matrices_for_frame_redisplay: Use them.  Remove
-       parameters CH_DIM.
+       (allocate_matrices_for_frame_redisplay: Use them.
+       Remove parameters CH_DIM.
 
        * xdisp.c (display_mode_lines): Temporarily set selected_frame
        and selected_window to the frame of the window whose mode-lines
        are displayed, and to the window itself.
        (redisplay_window, redisplay_mode_lines): Don't set selected_frame
-       here. 
+       here.
 
 2001-09-25  Gerd Moellmann  <gerd@gnu.org>
 
@@ -56,8 +59,7 @@
        the image cache under us.
 
        * xdisp.c (display_mode_element): If the mode element is a symbol
-       with a string value, use that string's multibyteness for
-       displaying.
+       with a string value, use that string's multibyteness for displaying.
 
        * keyboard.c (read_char): Don't clear a message for a switch-frame
        event.   From Stefan Monnier  <monnier@cs.yale.edu>.
@@ -87,8 +89,8 @@
 
 2001-09-21  Gerd Moellmann  <gerd@gnu.org>
 
-       * sysdep.c (wait_for_termination) [POSIX_SIGNALS]: Terminate
-       only if kill returns -1, and errno is ESRCH.
+       * sysdep.c (wait_for_termination) [POSIX_SIGNALS]:
+       Terminate only if kill returns -1, and errno is ESRCH.
 
 2001-09-21  Markus Rost  <rost@math.ohio-state.edu>
 

diff --git a/src/search.c b/src/search.c
index 0bf881565a91f82b28894dc5c689ddf76a5a5f4f..ff70bb3d36658dd31e8906a70a92f319a1ca87a2 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -962,7 +962,7 @@ trivial_regexp_p (regexp)
            {
            case '|': case '(': case ')': case '`': case '\'': case 'b':
            case 'B': case '<': case '>': case 'w': case 'W': case 's':
-           case 'S': case '=':
+           case 'S': case '=': case '{': case '}':
            case 'c': case 'C': /* for categoryspec and notcategoryspec */
            case '1': case '2': case '3': case '4': case '5':
            case '6': case '7': case '8': case '9':
@@ -2417,7 +2417,7 @@ since only regular expressions have distinguished subexpressions.")
       return concat3 (before, newtext, after);
     }
 
-  /* Record point, the move (quietly) to the start of the match.  */
+  /* Record point, then move (quietly) to the start of the match.  */
   if (PT >= search_regs.end[sub])
     opoint = PT - ZV;
   else if (PT > search_regs.start[sub])