procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fwrite_region): Use visiting' rather than visit'

Browse source 
when ensuring we don't do visit in indirect buffer.
This commit is contained in:
Stefan Monnier 2000-11-06 14:34:09 +00:00
parent 4d2806e27a
commit d3a67486af
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

8
src/fileio.c
View file

@ -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))