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

[Kim F. Storm]

Index: emacs/src/textprop.c
diff -c emacs/src/textprop.c:1.125 emacs/src/textprop.c:1.126
*** emacs/src/textprop.c:1.125  Thu Apr 18 20:14:14 2002
--- emacs/src/textprop.c        Mon Apr 22 13:56:38 2002
***************
*** 452,466 ****
    register Lisp_Object tail1, tail2, sym, current_plist;
    register int changed = 0;
  
!   /* Nonzero means tail1 is a list, otherwise it is a plist.  */
!   int use_list;
  
    current_plist = i->plist;
  
    if (! NILP (plist))
!     tail1 = plist, use_list = 0;
    else
!     tail1 = list, use_list = 1;
  
    /* Go through each element of LIST or PLIST.  */
    while (! NILP (tail1))
--- 452,466 ----
    register Lisp_Object tail1, tail2, sym, current_plist;
    register int changed = 0;
  
!   /* Nonzero means tail1 is a plist, otherwise it is a list.  */
!   int use_plist;
  
    current_plist = i->plist;
  
    if (! NILP (plist))
!     tail1 = plist, use_plist = 1;
    else
!     tail1 = list, use_plist = 0;
  
    /* Go through each element of LIST or PLIST.  */
    while (! NILP (tail1))
***************
*** 498,507 ****
        }
  
        /* Advance thru TAIL1 one way or the other.  */
!       if (use_list)
        tail1 = XCDR (tail1);
-       else
-       tail1 = XCDR (XCDR (tail1));
      }
  
    if (changed)
--- 498,506 ----
        }
  
        /* Advance thru TAIL1 one way or the other.  */
!       tail1 = XCDR (tail1);
!       if (use_plist && CONSP (tail1))
        tail1 = XCDR (tail1);
      }
  
    if (changed)