(Fplist_get): Replace by Fsafe_plist_get.

(Fsafe_plist_get): Rename to Fplist_get.
(Fsafe_get): Remove, as Fget now uses safe Fplist_get.
(defsubr): Remove defsubr for Fsafe_plist_get and Fsafe_get.

1 files changed, 8 insertions, 20 deletions

diff --git a/src/fns.c b/src/fns.c
index bad4da80959..a22bad7dea0 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -186,8 +186,7 @@ To get the number of bytes, use `string-bytes'. */)
   return val;
 }
 
-/* This does not check for quits.  That is safe
-   since it must terminate.  */
+/* This does not check for quits.  That is safe since it must terminate.  */
 
 DEFUN ("safe-length", Fsafe_length, Ssafe_length, 1, 1, 0,
        doc: /* Return the length of a list, but avoid error or infinite loop.
@@ -1981,6 +1980,7 @@ merge (org_l1, org_l2, pred)
 }
 
 
+#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
@@ -2011,14 +2011,16 @@ one of the properties on the list.  */)
 
   return Qnil;
 }
+#endif
+
+/* This does not check for quits.  That is safe since it must terminate.  */
 
-DEFUN ("safe-plist-get", Fsafe_plist_get, Ssafe_plist_get, 2, 2, 0,
+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.
-This function never signals an error.  */)
+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;
@@ -2051,18 +2053,6 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.  */)
   return Fplist_get (XSYMBOL (symbol)->plist, propname);
 }
 
-DEFUN ("safe-get", Fsafe_get, Ssafe_get, 2, 2, 0,
-       doc: /* Return the value of SYMBOL's PROPNAME property.
-This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.
-This function never signals an error.  */)
-     (symbol, propname)
-     Lisp_Object symbol, propname;
-{
-  if (!SYMBOLP (symbol))
-    return Qnil;
-  return Fsafe_plist_get (XSYMBOL (symbol)->plist, propname);
-}
-
 DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0,
        doc: /* Change value in PLIST of PROP to VAL.
 PLIST is a property list, which is a list of the form
@@ -5811,9 +5801,7 @@ used if both `use-dialog-box' and this variable are non-nil.  */);
   defsubr (&Sreverse);
   defsubr (&Ssort);
   defsubr (&Splist_get);
-  defsubr (&Ssafe_plist_get);
   defsubr (&Sget);
-  defsubr (&Ssafe_get);
   defsubr (&Splist_put);
   defsubr (&Sput);
   defsubr (&Slax_plist_get);