diff options
| author | Miles Bader | 2005-06-06 02:39:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-06-06 02:39:45 +0000 |
| commit | fdffd346262841cb194225ea0acd8059c57ec2d4 (patch) | |
| tree | d8b3699131f7d1b94bc46c7d8be62af6b8b5ebfe /src/fileio.c | |
| parent | a5c508fe3a3f456c987283156315d0384d38fe9e (diff) | |
| parent | a9b4333620eb259e974445066a8e64cee0c21d69 (diff) | |
| download | emacs-fdffd346262841cb194225ea0acd8059c57ec2d4.tar.gz emacs-fdffd346262841cb194225ea0acd8059c57ec2d4.zip | |
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
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 4a22cc0a59e..813c3033d67 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3750,7 +3750,7 @@ actually used. */) | |||
| 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)) |