Mercurial > emacs
comparison src/fileio.c @ 83202:42acc7fa8a4f
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-529
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-530
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-531
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-532
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-533
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-534
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-535
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-536
sync-tree with gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--devo--0--patch-2
Add {arch}/=cvs-sync-make-log
* miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0
Import from Gnus CVS branch V5-8
* miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-1
{arch}/=tagging-method: Add CVS and autoconf grot to junk regexp
* miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-2
Use explicit tags for autoconf input files
* miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-3
Remove RCS keywords
* miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-4
Fix copied explicit id-tags
* miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-5
Add {arch}/=cvs-sync-make-log
* miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-6
configure.in: Use ifelse instead of m4_if for arch-tag: comment
* miles@gnu.org--gnu-2004/gnus--rel--5.10--base-0
tag of miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-1
Gnus 5.10, from CVS branch v5-10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-2
Merge from gnus--rel--5.8
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-3
Use explicit tags for autoconf input files
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-4
sync-tree with gnus--rel--5.8
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-5
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-6
Merge from gnus--rel--5.8
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-7
Remove RCS keywords
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-8
Merge from gnus--rel--5.8
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-9
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-10
Add {arch}/=cvs-sync-make-log
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-11
Merge from gnus--rel--5.8
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-12
Update from CVS: make.bat: Fix line endings around arch-tag.
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-13
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-14
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-15
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-16
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-17
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-242
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 10 Sep 2004 13:06:10 +0000 |
parents | 0e38a1bd20a8 87de6585e906 |
children | b5dee7c1d483 |
comparison
equal
deleted
inserted
replaced
83201:8a6fd1c164cd | 83202:42acc7fa8a4f |
---|---|
172 Lisp_Object Vdefault_file_name_coding_system; | 172 Lisp_Object Vdefault_file_name_coding_system; |
173 | 173 |
174 /* Alist of elements (REGEXP . HANDLER) for file names | 174 /* Alist of elements (REGEXP . HANDLER) for file names |
175 whose I/O is done with a special handler. */ | 175 whose I/O is done with a special handler. */ |
176 Lisp_Object Vfile_name_handler_alist; | 176 Lisp_Object Vfile_name_handler_alist; |
177 | |
178 /* Format for auto-save files */ | |
179 Lisp_Object Vauto_save_file_format; | |
180 | 177 |
181 /* Lisp functions for translating file formats */ | 178 /* Lisp functions for translating file formats */ |
182 Lisp_Object Qformat_decode, Qformat_annotate_function; | 179 Lisp_Object Qformat_decode, Qformat_annotate_function; |
183 | 180 |
184 /* Function to be called to decide a coding system of a reading file. */ | 181 /* Function to be called to decide a coding system of a reading file. */ |
5372 annotations = merge (annotations, res, Qcar_less_than_car); | 5369 annotations = merge (annotations, res, Qcar_less_than_car); |
5373 p = XCDR (p); | 5370 p = XCDR (p); |
5374 } | 5371 } |
5375 | 5372 |
5376 /* Now do the same for annotation functions implied by the file-format */ | 5373 /* Now do the same for annotation functions implied by the file-format */ |
5377 if (auto_saving && (!EQ (Vauto_save_file_format, Qt))) | 5374 if (auto_saving && (!EQ (current_buffer->auto_save_file_format, Qt))) |
5378 p = Vauto_save_file_format; | 5375 p = current_buffer->auto_save_file_format; |
5379 else | 5376 else |
5380 p = current_buffer->file_format; | 5377 p = current_buffer->file_format; |
5381 for (i = 0; CONSP (p); p = XCDR (p), ++i) | 5378 for (i = 0; CONSP (p); p = XCDR (p), ++i) |
5382 { | 5379 { |
5383 struct buffer *given_buffer = current_buffer; | 5380 struct buffer *given_buffer = current_buffer; |
6490 This variable is set/changed by the command `set-language-environment'. | 6487 This variable is set/changed by the command `set-language-environment'. |
6491 User should not set this variable manually, | 6488 User should not set this variable manually, |
6492 instead use `file-name-coding-system' to get a constant encoding | 6489 instead use `file-name-coding-system' to get a constant encoding |
6493 of file names regardless of the current language environment. */); | 6490 of file names regardless of the current language environment. */); |
6494 Vdefault_file_name_coding_system = Qnil; | 6491 Vdefault_file_name_coding_system = Qnil; |
6495 | |
6496 DEFVAR_LISP ("auto-save-file-format", &Vauto_save_file_format, | |
6497 doc: /* *Format in which to write auto-save files. | |
6498 Should be a list of symbols naming formats that are defined in `format-alist'. | |
6499 If it is t, which is the default, auto-save files are written in the | |
6500 same format as a regular save would use. */); | |
6501 Vauto_save_file_format = Qt; | |
6502 | 6492 |
6503 Qformat_decode = intern ("format-decode"); | 6493 Qformat_decode = intern ("format-decode"); |
6504 staticpro (&Qformat_decode); | 6494 staticpro (&Qformat_decode); |
6505 Qformat_annotate_function = intern ("format-annotate-function"); | 6495 Qformat_annotate_function = intern ("format-annotate-function"); |
6506 staticpro (&Qformat_annotate_function); | 6496 staticpro (&Qformat_annotate_function); |