(Fwrite_region): Set visit_file to Qnil before GCPRO

it.

2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9ab5555e1b1..901ca108b1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2006-03-20  Kenichi Handa  <handa@m17n.org>
+
+        * fileio.c (Fwrite_region): Set visit_file to Qnil before GCPRO
+        it.
+
+        * keymap.c (map_keymap): Set tail to Qnil before GCPRO it.
+
+        * xfns.c (xg_set_icon): Remove unnecessary GCPRO.
+
+        * xterm.c (x_term_init): Remove unnecessary GCPRO.
+
 2006-03-19  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (set_cursor_from_row): Fix cursor property on overlay string,
diff --git a/src/fileio.c b/src/fileio.c
index 73dd799f806..14cec5de765 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5009,6 +5009,7 @@ This does code conversion according to the value of
   if (!NILP (start) && !STRINGP (start))
     validate_region (&start, &end);
 
+  visit_file = Qnil;
   GCPRO5 (start, filename, visit, visit_file, lockname);
 
   filename = Fexpand_file_name (filename, Qnil);