*** empty log message ***

3 files changed, 22 insertions, 10 deletions

diff --git a/etc/NEWS b/etc/NEWS
index ceced448a8e..70375864c21 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4204,16 +4204,8 @@ This returns the mode-line or header-line of the selected (or a
 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 --git a/lispref/ChangeLog b/lispref/ChangeLog
index 9fdc1ff9625..59ef2ab747e 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 54a593a34d5..1d09bde8487 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.