2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d6bab5bdefc..e5571067d4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (x_create_tip_frame): Copy `parms' before we modify it
+        in this function.  (Bug#5703)
+
 2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
 
         * nsterm.h: Fix last change.
diff --git a/src/w32fns.c b/src/w32fns.c
index 938bd463b25..795e7208569 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5427,6 +5427,10 @@ x_create_tip_frame (dpyinfo, parms, text)
 
   kb = dpyinfo->terminal->kboard;
 
+  /* The calls to x_get_arg remove elements from PARMS, so copy it to
+     avoid destructive changes behind our caller's back.  */
+  parms = Fcopy_alist (parms);
+
   /* Get the name of the frame to use for resource lookup.  */
   name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
   if (!STRINGP (name)