(Fwrite_region): Use `visiting' rather than `visit'

when ensuring we don't do visit in indirect buffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b36b5a39abb6e7f1fb3fc971c217da839a6022d..728d0f51a8a9b8201bb6266cadb8a3c9bb9dcd8b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-06  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * fileio.c (Fwrite_region): Use `visiting' rather than `visit'
+       when ensuring we don't do visit in indirect buffer.
+
 2000-11-06  Kenichi Handa  <handa@etl.go.jp>
 
        * composite.h (compose_chars_in_text): Add prototype.

diff --git a/src/fileio.c b/src/fileio.c
index a07ea27b1de34dae2b12c9033408affc983419f0..ce8172df03d4902f5b820ebc4a713c0aec2094a4 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4411,7 +4411,8 @@ This does code conversion according to the value of\n\
   Lisp_Object visit_file;
   Lisp_Object annotations;
   Lisp_Object encoded_filename;
-  int visiting, quietly;
+  int visiting = (EQ (visit, Qt) || STRINGP (visit));
+  int quietly = !NILP (visit);
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
   struct buffer *given_buffer;
 #ifdef DOS_NT
@@ -4419,7 +4420,7 @@ This does code conversion according to the value of\n\
 #endif /* DOS_NT */
   struct coding_system coding;
 
-  if (current_buffer->base_buffer && ! NILP (visit))
+  if (current_buffer->base_buffer && visiting)
     error ("Cannot do file visiting in an indirect buffer");
 
   if (!NILP (start) && !STRINGP (start))
@@ -4531,9 +4532,6 @@ This does code conversion according to the value of\n\
     visit_file = filename;
   UNGCPRO;
 
-  visiting = (EQ (visit, Qt) || STRINGP (visit));
-  quietly = !NILP (visit);
-
   annotations = Qnil;
 
   if (NILP (lockname))