diff options
| author | Eli Zaretskii | 2010-03-31 12:08:40 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-03-31 12:08:40 +0300 |
| commit | 4a217bedd4dffb1722401ebd2c5736886e441a0c (patch) | |
| tree | 095ed489112025ffbb44e5603159c1009288b467 | |
| parent | 4f103e0430a9c48084d26ab7f100542626c2acc6 (diff) | |
| download | emacs-4a217bedd4dffb1722401ebd2c5736886e441a0c.tar.gz emacs-4a217bedd4dffb1722401ebd2c5736886e441a0c.zip | |
Fix bug #5703.
w32fns.c (x_create_tip_frame): Copy `parms' before we modify it
in this function.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32fns.c | 4 |
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 @@ | |||
| 1 | 2010-03-31 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32fns.c (x_create_tip_frame): Copy `parms' before we modify it | ||
| 4 | in this function. (Bug#5703) | ||
| 5 | |||
| 1 | 2010-03-31 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-03-31 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * nsterm.h: Fix last change. | 8 | * 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) | |||
| 5427 | 5427 | ||
| 5428 | kb = dpyinfo->terminal->kboard; | 5428 | kb = dpyinfo->terminal->kboard; |
| 5429 | 5429 | ||
| 5430 | /* The calls to x_get_arg remove elements from PARMS, so copy it to | ||
| 5431 | avoid destructive changes behind our caller's back. */ | ||
| 5432 | parms = Fcopy_alist (parms); | ||
| 5433 | |||
| 5430 | /* Get the name of the frame to use for resource lookup. */ | 5434 | /* Get the name of the frame to use for resource lookup. */ |
| 5431 | name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING); | 5435 | name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING); |
| 5432 | if (!STRINGP (name) | 5436 | if (!STRINGP (name) |