[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fns.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/fns.c [emacs-unicode-2] |
Date: |
Fri, 19 Nov 2004 02:16:24 -0500 |
Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.342.2.12 emacs/src/fns.c:1.342.2.13
*** emacs/src/fns.c:1.342.2.12 Fri Nov 12 02:52:56 2004
--- emacs/src/fns.c Fri Nov 19 06:54:57 2004
***************
*** 701,707 ****
}
else
{
! XSETFASTINT (elt, SREF (this, thisindex++));
if (some_multibyte
&& XINT (elt) >= 0200
&& XINT (elt) < 0400)
--- 701,707 ----
}
else
{
! XSETFASTINT (elt, SREF (this, thisindex)); thisindex++;
if (some_multibyte
&& XINT (elt) >= 0200
&& XINT (elt) < 0400)
***************
*** 1924,1929 ****
--- 1924,1958 ----
return Qnil;
}
+ DEFUN ("safe-plist-get", Fsafe_plist_get, Ssafe_plist_get, 2, 2, 0,
+ doc: /* Extract a value from a property list.
+ PLIST is a property list, which is a list of the form
+ \(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
+ corresponding to the given PROP, or nil if PROP is not
+ one of the properties on the list.
+ This function never signals an error. */)
+ (plist, prop)
+ Lisp_Object plist;
+ Lisp_Object prop;
+ {
+ Lisp_Object tail, halftail;
+
+ /* halftail is used to detect circular lists. */
+ tail = halftail = plist;
+ while (CONSP (tail) && CONSP (XCDR (tail)))
+ {
+ if (EQ (prop, XCAR (tail)))
+ return XCAR (XCDR (tail));
+
+ tail = XCDR (XCDR (tail));
+ halftail = XCDR (halftail);
+ if (EQ (tail, halftail))
+ break;
+ }
+
+ return Qnil;
+ }
+
DEFUN ("get", Fget, Sget, 2, 2, 0,
doc: /* Return the value of SYMBOL's PROPNAME property.
This is the last value stored with `(put SYMBOL PROPNAME VALUE)'. */)
***************
*** 5202,5207 ****
--- 5231,5237 ----
defsubr (&Sreverse);
defsubr (&Ssort);
defsubr (&Splist_get);
+ defsubr (&Ssafe_plist_get);
defsubr (&Sget);
defsubr (&Splist_put);
defsubr (&Sput);