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

[Colin Walters]

Index: emacs/src/intervals.c
diff -c emacs/src/intervals.c:1.113 emacs/src/intervals.c:1.114
*** emacs/src/intervals.c:1.113 Thu Mar 14 03:11:46 2002
--- emacs/src/intervals.c       Sat Jun  8 16:25:17 2002
***************
*** 1813,1820 ****
       Lisp_Object plist;
       register Lisp_Object prop;
  {
!   register Lisp_Object tail, fallback;
!   fallback = Qnil;
  
    for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
      {
--- 1813,1828 ----
       Lisp_Object plist;
       register Lisp_Object prop;
  {
!   lookup_char_property (plist, prop, 1);
! }
! 
! Lisp_Object
! lookup_char_property (plist, prop, textprop)
!      Lisp_Object plist;
!      register Lisp_Object prop;
!      int textprop;
! {
!   register Lisp_Object tail, fallback = Qnil;
  
    for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
      {
***************
*** 1832,1840 ****
  
    if (! NILP (fallback))
      return fallback;
!   if (CONSP (Vdefault_text_properties))
!     return Fplist_get (Vdefault_text_properties, prop);
!   return Qnil;
  }
  
  
--- 1840,1859 ----
  
    if (! NILP (fallback))
      return fallback;
!   /* Check for alternative properties */
!   tail = Fassq (prop, Vchar_property_alias_alist);
!   if (NILP (tail))
!     return tail;
!   tail = XCDR (tail);
!   for (; NILP (fallback) && !NILP (tail); tail = XCDR (tail))
!     {
!       if (!CONSP (tail))
!       wrong_type_argument (Qlistp, tail);
!       fallback = Fplist_get (plist, XCAR (tail));
!     }
!   if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties))
!     fallback = Fplist_get (Vdefault_text_properties, prop);
!   return fallback;
  }