*** empty log message ***

2 files changed, 19 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 4696853e27..121ca16deb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4190,9 +4190,15 @@ 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-plist-get.
+** New function `safe-get'.
 
-This function is like plist-get, but never signals an error for
+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.
 
 +++
diff --git a/src/ChangeLog b/src/ChangeLog
index ac7d5fb07f..e4a9f4eae9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-19  Kim F. Storm  <[email protected]>
+
+	* fns.c (Fsafe_get): New function.
+	(syms_of_fns): Defsubr it.
+
+	* lisp.h (Fsafe_get): EXFUN it.
+
+	* xfaces.c (resolve_face_name): Use Fsafe_get to avoid redisplay
+	loops in case of bad face property lists.  Limit number of face
+	alias lookups to 10 (in case of face alias loops).
+
 2005-04-18  Kim F. Storm  <[email protected]>
 
 	* dispextern.h (struct glyph_row): New member overlay_arrow_bitmap.