[Emacs-diffs] Changes to emacs/src/search.c

[Stefan Monnier]

Index: emacs/src/search.c
diff -c emacs/src/search.c:1.182 emacs/src/search.c:1.183
*** emacs/src/search.c:1.182    Tue Jun 29 02:37:50 2004
--- emacs/src/search.c  Wed Jun 30 19:34:34 2004
***************
*** 1,5 ****
  /* String search routines for GNU Emacs.
!    Copyright (C) 1985, 86,87,93,94,97,98, 1999 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
--- 1,6 ----
  /* String search routines for GNU Emacs.
!    Copyright (C) 1985, 86,87,93,94,97,98, 1999, 2004
!              Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
***************
*** 2628,2634 ****
    CHECK_NUMBER (num);
    n = XINT (num);
    if (n < 0)
!     args_out_of_range (num, 0);
    if (search_regs.num_regs <= 0)
      error ("No match data, because no search succeeded");
    if (n >= search_regs.num_regs
--- 2629,2635 ----
    CHECK_NUMBER (num);
    n = XINT (num);
    if (n < 0)
!     args_out_of_range (num, make_number (0));
    if (search_regs.num_regs <= 0)
      error ("No match data, because no search succeeded");
    if (n >= search_regs.num_regs
***************
*** 2728,2737 ****
        data[2 * i] = data [2 * i + 1] = Qnil;
      }
  
!   if (BUFFERP(last_thing_searched)
!       && ! NILP (integers))
      {
!       XSETBUFFER(data[len], last_thing_searched);
        len++;
      }
  
--- 2729,2737 ----
        data[2 * i] = data [2 * i + 1] = Qnil;
      }
  
!   if (BUFFERP (last_thing_searched) && !NILP (integers))
      {
!       data[len] = last_thing_searched;
        len++;
      }
  
***************
*** 2811,2819 ****
      for (i = 0;; i++)
        {
        marker = Fcar (list);
!       if (BUFFERP(marker))
          {
!           XSETBUFFER(last_thing_searched, marker);
            break;
          }
        if (i >= length)
--- 2811,2819 ----
      for (i = 0;; i++)
        {
        marker = Fcar (list);
!       if (BUFFERP (marker))
          {
!           last_thing_searched = marker;
            break;
          }
        if (i >= length)