/[emacs]/emacs/src/search.c
ViewVC logotype

Diff of /emacs/src/search.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.174.2.5 by miles, Tue Jun 29 16:46:05 2004 UTC revision 1.174.2.6 by miles, Tue Jul 6 02:57:14 2004 UTC
# Line 1  Line 1 
1  /* String search routines for GNU Emacs.  /* String search routines for GNU Emacs.
2     Copyright (C) 1985, 86,87,93,94,97,98, 1999 Free Software Foundation, Inc.     Copyright (C) 1985, 86,87,93,94,97,98, 1999, 2004
3                 Free Software Foundation, Inc.
4    
5  This file is part of GNU Emacs.  This file is part of GNU Emacs.
6    
# Line 2582  match_limit (num, beginningp) Line 2583  match_limit (num, beginningp)
2583    CHECK_NUMBER (num);    CHECK_NUMBER (num);
2584    n = XINT (num);    n = XINT (num);
2585    if (n < 0)    if (n < 0)
2586      args_out_of_range (num, 0);      args_out_of_range (num, make_number (0));
2587    if (search_regs.num_regs <= 0)    if (search_regs.num_regs <= 0)
2588      error ("No match data, because no search succeeded");      error ("No match data, because no search succeeded");
2589    if (n >= search_regs.num_regs    if (n >= search_regs.num_regs
# Line 2682  Return value is undefined if the last se Line 2683  Return value is undefined if the last se
2683          data[2 * i] = data [2 * i + 1] = Qnil;          data[2 * i] = data [2 * i + 1] = Qnil;
2684      }      }
2685    
2686    if (BUFFERP(last_thing_searched)    if (BUFFERP (last_thing_searched) && !NILP (integers))
       && ! NILP (integers))  
2687      {      {
2688        XSETBUFFER(data[len], last_thing_searched);        data[len] = last_thing_searched;
2689        len++;        len++;
2690      }      }
2691    
# Line 2765  LIST should have been created by calling Line 2765  LIST should have been created by calling
2765      for (i = 0;; i++)      for (i = 0;; i++)
2766        {        {
2767          marker = Fcar (list);          marker = Fcar (list);
2768          if (BUFFERP(marker))          if (BUFFERP (marker))
2769            {            {
2770              XSETBUFFER(last_thing_searched, marker);              last_thing_searched = marker;
2771              break;              break;
2772            }            }
2773          if (i >= length)          if (i >= length)

Legend:
Removed from v.1.174.2.5  
changed lines
  Added in v.1.174.2.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26