Mercurial > emacs
comparison src/fileio.c @ 90188:01137c1fdbe9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 324-352)
- Merge from gnus--rel--5.10
- Update from CVS
- etc/emacs-buffer.gdb: Remove RCS keywords
* gnus--rel--5.10 (patch 70-79)
- Update from CVS
- Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 06 Jun 2005 02:39:45 +0000 |
parents | 5b029ff3b08d 23f332ae21c8 |
children | b7da78284d4c |
comparison
equal
deleted
inserted
replaced
90187:587ea1490d70 | 90188:01137c1fdbe9 |
---|---|
3748 unsigned char buffer[1 << 14]; | 3748 unsigned char buffer[1 << 14]; |
3749 int replace_handled = 0; | 3749 int replace_handled = 0; |
3750 int set_coding_system = 0; | 3750 int set_coding_system = 0; |
3751 Lisp_Object coding_system; | 3751 Lisp_Object coding_system; |
3752 int read_quit = 0; | 3752 int read_quit = 0; |
3753 int old_Vdeactivate_mark = Vdeactivate_mark; | 3753 Lisp_Object old_Vdeactivate_mark = Vdeactivate_mark; |
3754 int we_locked_file = 0; | 3754 int we_locked_file = 0; |
3755 | 3755 |
3756 if (current_buffer->base_buffer && ! NILP (visit)) | 3756 if (current_buffer->base_buffer && ! NILP (visit)) |
3757 error ("Cannot do file visiting in an indirect buffer"); | 3757 error ("Cannot do file visiting in an indirect buffer"); |
3758 | 3758 |