[Emacs-diffs] emacs/src ChangeLog fns.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/10 21:22:59

Modified files:
        src            : ChangeLog fns.c 

Log message:
        (Fplist_get): Merge the active and the uncommented code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7854&r2=1.7855
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fns.c?cvsroot=emacs&r1=1.466&r2=1.467

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7854
retrieving revision 1.7855
diff -u -b -r1.7854 -r1.7855
--- ChangeLog   10 Nov 2009 19:06:40 -0000      1.7854
+++ ChangeLog   10 Nov 2009 21:22:57 -0000      1.7855
@@ -1,3 +1,7 @@
+2009-11-10  Stefan Monnier  <address@hidden>
+
+       * fns.c (Fplist_get): Merge the active and the uncommented code.
+
 2009-11-10  Jan Djärv  <address@hidden>
 
        * keyboard.h: Declare timer_check.
@@ -12,7 +16,8 @@
        * xmenu.c (x_menu_wait_for_event): Remove code that did a timeout
        even if timer_check returned -1.
 
-       * gtkutil.c (xg_dialog_response_cb): data is now a struct xg_dialog_data
+       * gtkutil.c (xg_dialog_response_cb): Data is now a struct
+       xg_dialog_data.
        (pop_down_dialog): Destroy widget (if any), cancel timer and unref
        the event loop.
        (xg_maybe_add_timer, xg_dialog_run): New functions (bug #4574).

Index: fns.c
===================================================================
RCS file: /sources/emacs/emacs/src/fns.c,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -b -r1.466 -r1.467
--- fns.c       6 Nov 2009 18:47:51 -0000       1.466
+++ fns.c       10 Nov 2009 21:22:58 -0000      1.467
@@ -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;