Mercurial > emacs
diff src/fns.c @ 105937:88b92b3656ae
(Fplist_get): Merge the active and the uncommented code.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 10 Nov 2009 21:22:57 +0000 |
parents | 8103235103a7 |
children | ba3ffbd9c422 |
line wrap: on
line diff
--- a/src/fns.c Tue Nov 10 19:06:40 2009 +0000 +++ b/src/fns.c Tue Nov 10 21:22:57 2009 +0000 @@ -1927,38 +1927,6 @@ } -#if 0 /* Unsafe version. */ -DEFUN ("plist-get", Fplist_get, Splist_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. */) - (plist, prop) - Lisp_Object plist; - Lisp_Object prop; -{ - Lisp_Object tail; - - for (tail = plist; - CONSP (tail) && CONSP (XCDR (tail)); - tail = XCDR (XCDR (tail))) - { - if (EQ (prop, XCAR (tail))) - return XCAR (XCDR (tail)); - - /* This function can be called asynchronously - (setup_coding_system). Don't QUIT in that case. */ - if (!interrupt_input_blocked) - QUIT; - } - - CHECK_LIST_END (tail, prop); - - return Qnil; -} -#endif - /* This does not check for quits. That is safe since it must terminate. */ DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0, @@ -1984,6 +1952,13 @@ halftail = XCDR (halftail); if (EQ (tail, halftail)) break; + +#if 0 /* Unsafe version. */ + /* This function can be called asynchronously + (setup_coding_system). Don't QUIT in that case. */ + if (!interrupt_input_blocked) + QUIT; +#endif } return Qnil;