comparison src/fileio.c @ 56977:87de6585e906

Delete declaration for removed Vauto_save_file_format. (build_annotations): Adapt to replacement of `auto-save-file-format' with the new buffer-local variable `buffer-auto-save-file-format'. (syms_of_fileio): Delete DEFVAR_LISP for auto-save-file-format.
author Luc Teirlinck <teirllm@auburn.edu>
date Wed, 08 Sep 2004 02:26:27 +0000
parents c1b935408a2e
children 4c14357ffc27 42acc7fa8a4f cce1c0ee76ee
comparison
equal deleted inserted replaced
56976:b3aa8cb4c381 56977:87de6585e906
170 Lisp_Object Vdefault_file_name_coding_system; 170 Lisp_Object Vdefault_file_name_coding_system;
171 171
172 /* Alist of elements (REGEXP . HANDLER) for file names 172 /* Alist of elements (REGEXP . HANDLER) for file names
173 whose I/O is done with a special handler. */ 173 whose I/O is done with a special handler. */
174 Lisp_Object Vfile_name_handler_alist; 174 Lisp_Object Vfile_name_handler_alist;
175
176 /* Format for auto-save files */
177 Lisp_Object Vauto_save_file_format;
178 175
179 /* Lisp functions for translating file formats */ 176 /* Lisp functions for translating file formats */
180 Lisp_Object Qformat_decode, Qformat_annotate_function; 177 Lisp_Object Qformat_decode, Qformat_annotate_function;
181 178
182 /* Function to be called to decide a coding system of a reading file. */ 179 /* Function to be called to decide a coding system of a reading file. */
5370 annotations = merge (annotations, res, Qcar_less_than_car); 5367 annotations = merge (annotations, res, Qcar_less_than_car);
5371 p = XCDR (p); 5368 p = XCDR (p);
5372 } 5369 }
5373 5370
5374 /* Now do the same for annotation functions implied by the file-format */ 5371 /* Now do the same for annotation functions implied by the file-format */
5375 if (auto_saving && (!EQ (Vauto_save_file_format, Qt))) 5372 if (auto_saving && (!EQ (current_buffer->auto_save_file_format, Qt)))
5376 p = Vauto_save_file_format; 5373 p = current_buffer->auto_save_file_format;
5377 else 5374 else
5378 p = current_buffer->file_format; 5375 p = current_buffer->file_format;
5379 for (i = 0; CONSP (p); p = XCDR (p), ++i) 5376 for (i = 0; CONSP (p); p = XCDR (p), ++i)
5380 { 5377 {
5381 struct buffer *given_buffer = current_buffer; 5378 struct buffer *given_buffer = current_buffer;
6488 This variable is set/changed by the command `set-language-environment'. 6485 This variable is set/changed by the command `set-language-environment'.
6489 User should not set this variable manually, 6486 User should not set this variable manually,
6490 instead use `file-name-coding-system' to get a constant encoding 6487 instead use `file-name-coding-system' to get a constant encoding
6491 of file names regardless of the current language environment. */); 6488 of file names regardless of the current language environment. */);
6492 Vdefault_file_name_coding_system = Qnil; 6489 Vdefault_file_name_coding_system = Qnil;
6493
6494 DEFVAR_LISP ("auto-save-file-format", &Vauto_save_file_format,
6495 doc: /* *Format in which to write auto-save files.
6496 Should be a list of symbols naming formats that are defined in `format-alist'.
6497 If it is t, which is the default, auto-save files are written in the
6498 same format as a regular save would use. */);
6499 Vauto_save_file_format = Qt;
6500 6490
6501 Qformat_decode = intern ("format-decode"); 6491 Qformat_decode = intern ("format-decode");
6502 staticpro (&Qformat_decode); 6492 staticpro (&Qformat_decode);
6503 Qformat_annotate_function = intern ("format-annotate-function"); 6493 Qformat_annotate_function = intern ("format-annotate-function");
6504 staticpro (&Qformat_annotate_function); 6494 staticpro (&Qformat_annotate_function);