# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1114127193 0
# Node ID f3e243c78a1be05ec312405182f4b6b9fe96d08a
# Parent  f012c6fd08c461e61d519a6d4d3219cc11e978b4
*** empty log message ***

diff -r f012c6fd08c4 -r f3e243c78a1b etc/NEWS
--- a/etc/NEWS	Thu Apr 21 23:45:40 2005 +0000
+++ b/etc/NEWS	Thu Apr 21 23:46:33 2005 +0000
@@ -4204,16 +4204,8 @@
 specified) window as a string with or without text properties.
 
 +++
-** New function `safe-get'.
-
-This function is like `get', but never signals an error for
-a malformed symbol property list.
-
-+++
-** New function `safe-plist-get'.
-
-This function is like `plist-get', but never signals an error for
-a malformed property list.
+** Functions `get' and `plist-get' no longer signals an error for
+a malformed property list.  They also detect cyclic lists.
 
 +++
 ** New functions `lax-plist-get' and `lax-plist-put'.
diff -r f012c6fd08c4 -r f3e243c78a1b lispref/ChangeLog
--- a/lispref/ChangeLog	Thu Apr 21 23:45:40 2005 +0000
+++ b/lispref/ChangeLog	Thu Apr 21 23:46:33 2005 +0000
@@ -1,3 +1,8 @@
+2005-04-22  Kim F. Storm  <storm@cua.dk>
+
+	* symbols.texi (Symbol Plists): Remove safe-get, as get is now safe.
+	(Other Plists): Remove safe-plist-get, as plist-get is now safe.
+
 2005-04-21  Lute Kamstra  <lute@gnu.org>
 
 	* lists.texi (Association Lists): Document rassq-delete-all.
diff -r f012c6fd08c4 -r f3e243c78a1b src/ChangeLog
--- a/src/ChangeLog	Thu Apr 21 23:45:40 2005 +0000
+++ b/src/ChangeLog	Thu Apr 21 23:46:33 2005 +0000
@@ -1,3 +1,18 @@
+2005-04-22  Kim F. Storm  <storm@cua.dk>
+
+	* fns.c (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.
+
+	* lisp.h (Fsafe_plist_get, Fsafe_get): Remove EXFUN.
+
+	* xdisp.c (store_mode_line_string, produce_stretch_glyph)
+	(note_mode_line_or_margin_highlight, note_mouse_highlight):
+	Use Fplist_get instead of Fsafe_plist_get.
+
+	* xfaces.c (resolve_face_name): Use Fget instead of Fsafe_get.
+
 2005-04-21  Miles Bader  <miles@gnu.org>
 
 	* xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.