*** empty log message ***

3 files changed, 20 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index c96eb114727..440ef5d5431 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3640,6 +3640,12 @@ 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.
+
+This function is like plist-get, but never signals an error for
+a malformed property list.
+
++++
 ** New functions `lax-plist-get' and `lax-plist-put'.
 
 These functions are like `plist-get' and `plist-put' except that they
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 0ba9c4f2519..104037b6516 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,6 +1,7 @@
 2004-11-15  Kim F. Storm  <storm@cua.dk>
 
-        * symbols.texi (Other Plists): Add safe-plist-get.
+        * symbols.texi (Other Plists): Note that plist-get may signal error.
+        Add safe-plist-get.
 
 2004-11-15  Thien-Thi Nguyen  <ttn@gnu.org>
 
diff --git a/src/ChangeLog b/src/ChangeLog
index a21effceed4..046e132518d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-15  Kim F. Storm  <storm@cua.dk>
+
+        * fns.c (Fsafe_plist_get): New defun.
+        (syms_of_fns): Defsubr it.
+
+        * lisp.h (Fsafe_plist_get): Add EXFUN.
+
+        * xdisp.c (store_mode_line_string, produce_stretch_glyph):
+        Use Fsafe_plist_get.
+        (note_mode_line_or_margin_highlight, note_mouse_highlight):
+        Fix image map element parsing.  Use Fsafe_plist_get.
+
 2004-11-15  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (get_next_display_element): Fix previous change.