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

Diff of /emacs/src/textprop.c

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

revision 1.117 by rms, Fri Nov 2 07:12:33 2001 UTC revision 1.118 by pj, Fri Nov 2 20:34:03 2001 UTC
# Line 123  validate_interval_range (object, begin, Line 123  validate_interval_range (object, begin,
123    register INTERVAL i;    register INTERVAL i;
124    int searchpos;    int searchpos;
125    
126    CHECK_STRING_OR_BUFFER (object, 0);    CHECK_STRING_OR_BUFFER (object);
127    CHECK_NUMBER_COERCE_MARKER (*begin, 0);    CHECK_NUMBER_COERCE_MARKER (*begin);
128    CHECK_NUMBER_COERCE_MARKER (*end, 0);    CHECK_NUMBER_COERCE_MARKER (*end);
129    
130    /* If we are asked for a point, but from a subr which operates    /* If we are asked for a point, but from a subr which operates
131       on a range, then return nothing.  */       on a range, then return nothing.  */
# Line 505  interval_of (position, object) Line 505  interval_of (position, object)
505    else if (EQ (object, Qt))    else if (EQ (object, Qt))
506      return NULL_INTERVAL;      return NULL_INTERVAL;
507    
508    CHECK_STRING_OR_BUFFER (object, 0);    CHECK_STRING_OR_BUFFER (object);
509    
510    if (BUFFERP (object))    if (BUFFERP (object))
511      {      {
# Line 589  get_char_property_and_overlay (position, Line 589  get_char_property_and_overlay (position,
589  {  {
590    struct window *w = 0;    struct window *w = 0;
591    
592    CHECK_NUMBER_COERCE_MARKER (position, 0);    CHECK_NUMBER_COERCE_MARKER (position);
593    
594    if (NILP (object))    if (NILP (object))
595      XSETBUFFER (object, current_buffer);      XSETBUFFER (object, current_buffer);
# Line 687  past position LIMIT; return LIMIT if not Line 687  past position LIMIT; return LIMIT if not
687    temp = Fnext_overlay_change (position);    temp = Fnext_overlay_change (position);
688    if (! NILP (limit))    if (! NILP (limit))
689      {      {
690        CHECK_NUMBER (limit, 2);        CHECK_NUMBER (limit);
691        if (XINT (limit) < XINT (temp))        if (XINT (limit) < XINT (temp))
692          temp = limit;          temp = limit;
693      }      }
# Line 712  past position LIMIT; return LIMIT if not Line 712  past position LIMIT; return LIMIT if not
712    temp = Fprevious_overlay_change (position);    temp = Fprevious_overlay_change (position);
713    if (! NILP (limit))    if (! NILP (limit))
714      {      {
715        CHECK_NUMBER (limit, 2);        CHECK_NUMBER (limit);
716        if (XINT (limit) > XINT (temp))        if (XINT (limit) > XINT (temp))
717          temp = limit;          temp = limit;
718      }      }
# Line 751  past position LIMIT; return LIMIT if not Line 751  past position LIMIT; return LIMIT if not
751        int count = specpdl_ptr - specpdl;        int count = specpdl_ptr - specpdl;
752    
753        if (! NILP (object))        if (! NILP (object))
754          CHECK_BUFFER (object, 0);          CHECK_BUFFER (object);
755                
756        if (BUFFERP (object) && current_buffer != XBUFFER (object))        if (BUFFERP (object) && current_buffer != XBUFFER (object))
757          {          {
# Line 764  past position LIMIT; return LIMIT if not Line 764  past position LIMIT; return LIMIT if not
764        if (NILP (limit))        if (NILP (limit))
765          XSETFASTINT (limit, BUF_ZV (current_buffer));          XSETFASTINT (limit, BUF_ZV (current_buffer));
766        else        else
767          CHECK_NUMBER_COERCE_MARKER (limit, 0);          CHECK_NUMBER_COERCE_MARKER (limit);
768    
769        for (;;)        for (;;)
770          {          {
# Line 816  back past position LIMIT; return LIMIT i Line 816  back past position LIMIT; return LIMIT i
816        int count = specpdl_ptr - specpdl;        int count = specpdl_ptr - specpdl;
817    
818        if (! NILP (object))        if (! NILP (object))
819          CHECK_BUFFER (object, 0);          CHECK_BUFFER (object);
820                
821        if (BUFFERP (object) && current_buffer != XBUFFER (object))        if (BUFFERP (object) && current_buffer != XBUFFER (object))
822          {          {
# Line 827  back past position LIMIT; return LIMIT i Line 827  back past position LIMIT; return LIMIT i
827        if (NILP (limit))        if (NILP (limit))
828          XSETFASTINT (limit, BUF_BEGV (current_buffer));          XSETFASTINT (limit, BUF_BEGV (current_buffer));
829        else        else
830          CHECK_NUMBER_COERCE_MARKER (limit, 0);          CHECK_NUMBER_COERCE_MARKER (limit);
831    
832        if (XFASTINT (position) <= XFASTINT (limit))        if (XFASTINT (position) <= XFASTINT (limit))
833          position = limit;          position = limit;
# Line 884  past position LIMIT; return LIMIT if not Line 884  past position LIMIT; return LIMIT if not
884      XSETBUFFER (object, current_buffer);      XSETBUFFER (object, current_buffer);
885    
886    if (! NILP (limit) && ! EQ (limit, Qt))    if (! NILP (limit) && ! EQ (limit, Qt))
887      CHECK_NUMBER_COERCE_MARKER (limit, 0);      CHECK_NUMBER_COERCE_MARKER (limit);
888    
889    i = validate_interval_range (object, &position, &position, soft);    i = validate_interval_range (object, &position, &position, soft);
890    
# Line 978  past position LIMIT; return LIMIT if not Line 978  past position LIMIT; return LIMIT if not
978      XSETBUFFER (object, current_buffer);      XSETBUFFER (object, current_buffer);
979    
980    if (!NILP (limit))    if (!NILP (limit))
981      CHECK_NUMBER_COERCE_MARKER (limit, 0);      CHECK_NUMBER_COERCE_MARKER (limit);
982    
983    i = validate_interval_range (object, &position, &position, soft);    i = validate_interval_range (object, &position, &position, soft);
984    if (NULL_INTERVAL_P (i))    if (NULL_INTERVAL_P (i))
# Line 1019  back past position LIMIT; return LIMIT i Line 1019  back past position LIMIT; return LIMIT i
1019      XSETBUFFER (object, current_buffer);      XSETBUFFER (object, current_buffer);
1020    
1021    if (!NILP (limit))    if (!NILP (limit))
1022      CHECK_NUMBER_COERCE_MARKER (limit, 0);      CHECK_NUMBER_COERCE_MARKER (limit);
1023    
1024    i = validate_interval_range (object, &position, &position, soft);    i = validate_interval_range (object, &position, &position, soft);
1025    if (NULL_INTERVAL_P (i))    if (NULL_INTERVAL_P (i))
# Line 1065  back past position LIMIT; return LIMIT i Line 1065  back past position LIMIT; return LIMIT i
1065      XSETBUFFER (object, current_buffer);      XSETBUFFER (object, current_buffer);
1066    
1067    if (!NILP (limit))    if (!NILP (limit))
1068      CHECK_NUMBER_COERCE_MARKER (limit, 0);      CHECK_NUMBER_COERCE_MARKER (limit);
1069    
1070    i = validate_interval_range (object, &position, &position, soft);    i = validate_interval_range (object, &position, &position, soft);
1071    
# Line 1562  copy_text_properties (start, end, src, p Line 1562  copy_text_properties (start, end, src, p
1562    if (NULL_INTERVAL_P (i))    if (NULL_INTERVAL_P (i))
1563      return Qnil;      return Qnil;
1564    
1565    CHECK_NUMBER_COERCE_MARKER (pos, 0);    CHECK_NUMBER_COERCE_MARKER (pos);
1566    {    {
1567      Lisp_Object dest_start, dest_end;      Lisp_Object dest_start, dest_end;
1568    

Legend:
Removed from v.1.117  
changed lines
  Added in v.1.118

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