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

[David Kastrup]

Index: emacs/src/textprop.c
diff -c emacs/src/textprop.c:1.139 emacs/src/textprop.c:1.140
*** emacs/src/textprop.c:1.139  Wed Oct 13 16:58:45 2004
--- emacs/src/textprop.c        Tue Mar 22 16:04:02 2005
***************
*** 729,735 ****
    temp = Fnext_overlay_change (position);
    if (! NILP (limit))
      {
!       CHECK_NUMBER (limit);
        if (XINT (limit) < XINT (temp))
        temp = limit;
      }
--- 729,735 ----
    temp = Fnext_overlay_change (position);
    if (! NILP (limit))
      {
!       CHECK_NUMBER_COERCE_MARKER (limit);
        if (XINT (limit) < XINT (temp))
        temp = limit;
      }
***************
*** 754,760 ****
    temp = Fprevious_overlay_change (position);
    if (! NILP (limit))
      {
!       CHECK_NUMBER (limit);
        if (XINT (limit) > XINT (temp))
        temp = limit;
      }
--- 754,760 ----
    temp = Fprevious_overlay_change (position);
    if (! NILP (limit))
      {
!       CHECK_NUMBER_COERCE_MARKER (limit);
        if (XINT (limit) > XINT (temp))
        temp = limit;
      }
***************
*** 787,793 ****
          if (NILP (limit))
            position = make_number (SCHARS (object));
          else
!           position = limit;
        }
      }
    else
--- 787,796 ----
          if (NILP (limit))
            position = make_number (SCHARS (object));
          else
!           {
!             CHECK_NUMBER (limit);
!             position = limit;
!           }
        }
      }
    else
***************
*** 804,809 ****
--- 807,814 ----
          Fset_buffer (object);
        }
  
+       CHECK_NUMBER_COERCE_MARKER (position);
+ 
        initial_value = Fget_char_property (position, prop, object);
  
        if (NILP (limit))
***************
*** 856,862 ****
          if (NILP (limit))
            position = make_number (SCHARS (object));
          else
!           position = limit;
        }
      }
    else
--- 861,870 ----
          if (NILP (limit))
            position = make_number (SCHARS (object));
          else
!           {
!             CHECK_NUMBER (limit);
!             position = limit;
!           }
        }
      }
    else
***************
*** 872,877 ****
--- 880,887 ----
          Fset_buffer (object);
        }
  
+       CHECK_NUMBER_COERCE_MARKER (position);
+ 
        if (NILP (limit))
        XSETFASTINT (limit, BUF_BEGV (current_buffer));
        else