/[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.164.2.8 by miles, Tue Jul 6 10:23:40 2004 UTC revision 1.164.2.9 by miles, Tue Jul 6 10:27:01 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 2628  match_limit (num, beginningp) Line 2629  match_limit (num, beginningp)
2629    CHECK_NUMBER (num);    CHECK_NUMBER (num);
2630    n = XINT (num);    n = XINT (num);
2631    if (n < 0)    if (n < 0)
2632      args_out_of_range (num, 0);      args_out_of_range (num, make_number (0));
2633    if (search_regs.num_regs <= 0)    if (search_regs.num_regs <= 0)
2634      error ("No match data, because no search succeeded");      error ("No match data, because no search succeeded");
2635    if (n >= search_regs.num_regs    if (n >= search_regs.num_regs
# Line 2728  Return value is undefined if the last se Line 2729  Return value is undefined if the last se
2729          data[2 * i] = data [2 * i + 1] = Qnil;          data[2 * i] = data [2 * i + 1] = Qnil;
2730      }      }
2731    
2732    if (BUFFERP(last_thing_searched)    if (BUFFERP (last_thing_searched) && !NILP (integers))
       && ! NILP (integers))  
2733      {      {
2734        XSETBUFFER(data[len], last_thing_searched);        data[len] = last_thing_searched;
2735        len++;        len++;
2736      }      }
2737    
# Line 2811  LIST should have been created by calling Line 2811  LIST should have been created by calling
2811      for (i = 0;; i++)      for (i = 0;; i++)
2812        {        {
2813          marker = Fcar (list);          marker = Fcar (list);
2814          if (BUFFERP(marker))          if (BUFFERP (marker))
2815            {            {
2816              XSETBUFFER(last_thing_searched, marker);              last_thing_searched = marker;
2817              break;              break;
2818            }            }
2819          if (i >= length)          if (i >= length)

Legend:
Removed from v.1.164.2.8  
changed lines
  Added in v.1.164.2.9

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