emacs: src/search.c comparison

comparison src/search.c @ 89945:59dcbfe97385

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-17 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-417 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-419 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-420 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-421 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-430 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Tue, 29 Jun 2004 16:46:06 +0000
parents	4c90ffeb71c5 b04610e283ce
children	6f6e9fe4658b

comparison

equal deleted inserted replaced

-:ecb75580442e
+:59dcbfe97385
 			     make_number (newpoint));
 /* Adjust search data for this change.  */
 {
 int oldend = search_regs.end[sub];
+int oldstart = search_regs.start[sub];
 int change = newpoint - search_regs.end[sub];
 int i;
 for (i = 0; i < search_regs.num_regs; i++)
 {
-	if (search_regs.start[i] > oldend)
+	if (search_regs.start[i] >= oldend)
 	  search_regs.start[i] += change;
-	if (search_regs.end[i] > oldend)
+	else if (search_regs.start[i] > oldstart)
+	  search_regs.start[i] = oldstart;
+	if (search_regs.end[i] >= oldend)
 	  search_regs.end[i] += change;
+	else if (search_regs.end[i] > oldstart)
+	  search_regs.end[i] = oldstart;
 }
 }
 /* Put point back where it was in the text.  */
 if (opoint <= 0)
 Element 2N is `(match-beginning N)'; element 2N + 1 is `(match-end N)'.
 All the elements are markers or nil (nil if the Nth pair didn't match)
 if the last match was on a buffer; integers or nil if a string was matched.
 Use `store-match-data' to reinstate the data in this list.
-If INTEGERS (the optional first argument) is non-nil, always use integers
+If INTEGERS (the optional first argument) is non-nil, always use
-\(rather than markers) to represent buffer positions.
+integers \(rather than markers) to represent buffer positions.  In
+this case, and if the last match was in a buffer, the buffer will get
+stored as one additional element at the end of the list.
 If REUSE is a list, reuse it as part of the value.  If REUSE is long enough
 to hold all the values, and if INTEGERS is non-nil, no consing is done.
 Return value is undefined if the last search failed.  */)
 (integers, reuse)
 if (NILP (last_thing_searched))
 return Qnil;
 prev = Qnil;
-data = (Lisp_Object *) alloca ((2 * search_regs.num_regs)
+data = (Lisp_Object *) alloca ((2 * search_regs.num_regs + 1)
 				 * sizeof (Lisp_Object));
-len = -1;
+len = 0;
 for (i = 0; i < search_regs.num_regs; i++)
 {
 int start = search_regs.start[i];
 if (start >= 0)
 	{
 	    }
 	  else
 	    /* last_thing_searched must always be Qt, a buffer, or Qnil.  */
 	    abort ();
-	  len = i;
+	  len = 2*(i+1);
 	}
 else
 	data[2 * i] = data [2 * i + 1] = Qnil;
 }
+if (BUFFERP(last_thing_searched)
+&& ! NILP (integers))
+{
+XSETBUFFER(data[len], last_thing_searched);
+len++;
+}
 /* If REUSE is not usable, cons up the values and return them.  */
 if (! CONSP (reuse))
-return Flist (2 * len + 2, data);
+return Flist (len, data);
 /* If REUSE is a list, store as many value elements as will fit
 into the elements of REUSE.  */
 for (i = 0, tail = reuse; CONSP (tail);
 i++, tail = XCDR (tail))
 {
-if (i < 2 * len + 2)
+if (i < len)
 	XSETCAR (tail, data[i]);
 else
 	XSETCAR (tail, Qnil);
 prev = tail;
 }
 /* If we couldn't fit all value elements into REUSE,
 cons up the rest of them and add them to the end of REUSE.  */
-if (i < 2 * len + 2)
+if (i < len)
-XSETCDR (prev, Flist (2 * len + 2 - i, data + i));
+XSETCDR (prev, Flist (len - i, data + i));
 return reuse;
 }
 save_search_regs ();
 if (!CONSP (list) && !NILP (list))
 list = wrong_type_argument (Qconsp, list);
-/* Unless we find a marker with a buffer in LIST, assume that this
+/* Unless we find a marker with a buffer or an explicit buffer
-match data came from a string.  */
+in LIST, assume that this match data came from a string.  */
 last_thing_searched = Qt;
 /* Allocate registers if they don't already exist.  */
 {
 int length = XFASTINT (Flength (list)) / 2;
 	for (i = search_regs.num_regs; i < length; i++)
 	  search_regs.start[i] = -1;
 	search_regs.num_regs = length;
 }
+for (i = 0;; i++)
+{
+	marker = Fcar (list);
+	if (BUFFERP(marker))
+	  {
+	    XSETBUFFER(last_thing_searched, marker);
+	    break;
+	  }
+	if (i >= length)
+	  break;
+	if (NILP (marker))
+	  {
+	    search_regs.start[i] = -1;
+	    list = Fcdr (list);
+	  }
+	else
+	  {
+	    int from;
+	    if (MARKERP (marker))
+	      {
+		if (XMARKER (marker)->buffer == 0)
+		  XSETFASTINT (marker, 0);
+		else
+		  XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer);
+	      }
+	    CHECK_NUMBER_COERCE_MARKER (marker);
+	    from = XINT (marker);
+	    list = Fcdr (list);
+	    marker = Fcar (list);
+	    if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
+	      XSETFASTINT (marker, 0);
+	    CHECK_NUMBER_COERCE_MARKER (marker);
+	    search_regs.start[i] = from;
+	    search_regs.end[i] = XINT (marker);
+	  }
+	list = Fcdr (list);
+}
+for (; i < search_regs.num_regs; i++)
+search_regs.start[i] = -1;
 }
-for (i = 0; i < search_regs.num_regs; i++)
-{
-marker = Fcar (list);
-if (NILP (marker))
-	{
-	  search_regs.start[i] = -1;
-	  list = Fcdr (list);
-	}
-else
-	{
-	  int from;
-	  if (MARKERP (marker))
-	    {
-	      if (XMARKER (marker)->buffer == 0)
-		XSETFASTINT (marker, 0);
-	      else
-		XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer);
-	    }
-	  CHECK_NUMBER_COERCE_MARKER (marker);
-	  from = XINT (marker);
-	  list = Fcdr (list);
-	  marker = Fcar (list);
-	  if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
-	    XSETFASTINT (marker, 0);
-	  CHECK_NUMBER_COERCE_MARKER (marker);
-	  search_regs.start[i] = from;
-	  search_regs.end[i] = XINT (marker);
-	}
-list = Fcdr (list);
-}
 return Qnil;
 }
 /* If non-zero the match data have been saved in saved_search_regs
 during the execution of a sentinel or filter. */
 static int search_regs_saved;
 static struct re_registers saved_search_regs;
+static Lisp_Object saved_last_thing_searched;
 /* Called from Flooking_at, Fstring_match, search_buffer, Fstore_match_data
 if asynchronous code (filter or sentinel) is running. */
 static void
 save_search_regs ()
 if (!search_regs_saved)
 {
 saved_search_regs.num_regs = search_regs.num_regs;
 saved_search_regs.start = search_regs.start;
 saved_search_regs.end = search_regs.end;
+saved_last_thing_searched = last_thing_searched;
+last_thing_searched = Qnil;
 search_regs.num_regs = 0;
 search_regs.start = 0;
 search_regs.end = 0;
 search_regs_saved = 1;
 	  xfree (search_regs.end);
 	}
 search_regs.num_regs = saved_search_regs.num_regs;
 search_regs.start = saved_search_regs.start;
 search_regs.end = saved_search_regs.end;
+last_thing_searched = saved_last_thing_searched;
+saved_last_thing_searched = Qnil;
 search_regs_saved = 0;
 }
 }
 /* Quote a string to inactivate reg-expr chars */

Mercurial > emacs

comparison src/search.c @ 89945:59dcbfe97385