aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2000-11-06 14:34:09 +0000
committerStefan Monnier2000-11-06 14:34:09 +0000
commitd3a67486af4a57469747994c020e93a8897ac49b (patch)
treedecc5219a2f7b1226b0028d41a647e3a1f9ac935
parent4d2806e27adf13ae54e8013d393d09e51d8aaefa (diff)
downloademacs-d3a67486af4a57469747994c020e93a8897ac49b.tar.gz
emacs-d3a67486af4a57469747994c020e93a8897ac49b.zip
(Fwrite_region): Use `visiting' rather than `visit'
when ensuring we don't do visit in indirect buffer.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fileio.c8
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 @@
12000-11-06 Stefan Monnier <monnier@cs.yale.edu>
2
3 * fileio.c (Fwrite_region): Use `visiting' rather than `visit'
4 when ensuring we don't do visit in indirect buffer.
5
12000-11-06 Kenichi Handa <handa@etl.go.jp> 62000-11-06 Kenichi Handa <handa@etl.go.jp>
2 7
3 * composite.h (compose_chars_in_text): Add prototype. 8 * 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\
4411 Lisp_Object visit_file; 4411 Lisp_Object visit_file;
4412 Lisp_Object annotations; 4412 Lisp_Object annotations;
4413 Lisp_Object encoded_filename; 4413 Lisp_Object encoded_filename;
4414 int visiting, quietly; 4414 int visiting = (EQ (visit, Qt) || STRINGP (visit));
4415 int quietly = !NILP (visit);
4415 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; 4416 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
4416 struct buffer *given_buffer; 4417 struct buffer *given_buffer;
4417#ifdef DOS_NT 4418#ifdef DOS_NT
@@ -4419,7 +4420,7 @@ This does code conversion according to the value of\n\
4419#endif /* DOS_NT */ 4420#endif /* DOS_NT */
4420 struct coding_system coding; 4421 struct coding_system coding;
4421 4422
4422 if (current_buffer->base_buffer && ! NILP (visit)) 4423 if (current_buffer->base_buffer && visiting)
4423 error ("Cannot do file visiting in an indirect buffer"); 4424 error ("Cannot do file visiting in an indirect buffer");
4424 4425
4425 if (!NILP (start) && !STRINGP (start)) 4426 if (!NILP (start) && !STRINGP (start))
@@ -4531,9 +4532,6 @@ This does code conversion according to the value of\n\
4531 visit_file = filename; 4532 visit_file = filename;
4532 UNGCPRO; 4533 UNGCPRO;
4533 4534
4534 visiting = (EQ (visit, Qt) || STRINGP (visit));
4535 quietly = !NILP (visit);
4536
4537 annotations = Qnil; 4535 annotations = Qnil;
4538 4536
4539 if (NILP (lockname)) 4537 if (NILP (lockname))