From d3a67486af4a57469747994c020e93a8897ac49b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 6 Nov 2000 14:34:09 +0000 Subject: [PATCH] (Fwrite_region): Use `visiting' rather than `visit' when ensuring we don't do visit in indirect buffer. --- src/ChangeLog | 5 +++++ src/fileio.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4b36b5a39ab..728d0f51a8a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-11-06 Stefan Monnier + + * fileio.c (Fwrite_region): Use `visiting' rather than `visit' + when ensuring we don't do visit in indirect buffer. + 2000-11-06 Kenichi Handa * composite.h (compose_chars_in_text): Add prototype. diff --git a/src/fileio.c b/src/fileio.c index a07ea27b1de..ce8172df03d 100644 --- 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)) -- 2.39.5