Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/fileio.c Sun Jun 05 01:58:02 2005 +0000 +++ b/src/fileio.c Mon Jun 06 02:39:45 2005 +0000 @@ -3750,7 +3750,7 @@ int set_coding_system = 0; Lisp_Object coding_system; int read_quit = 0; - int old_Vdeactivate_mark = Vdeactivate_mark; + Lisp_Object old_Vdeactivate_mark = Vdeactivate_mark; int we_locked_file = 0; if (current_buffer->base_buffer && ! NILP (visit))