From f844ba4efd84606ff612639de472c1ac83e7a2b6 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Wed, 8 Sep 2004 02:30:12 +0000 Subject: [PATCH] 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. --- src/ChangeLog | 15 +++++++++++++++ src/fileio.c | 14 ++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 08783ab0f8e..498af248e85 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2004-09-07 Luc Teirlinck + + * buffer.h (struct buffer): Add auto_save_file_format field. + + * buffer.c (reset_buffer, init_buffer_once): Handle + auto_save_file_format field. + (syms_of_buffer): Add DEFVAR_PER_BUFFER for + `buffer-auto-save-file-format'. + + * fileio.c: 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. + 2004-09-07 Jason Rumney * w32term.h (AppendMenuW_Proc): Move declaration from w32menu.c. diff --git a/src/fileio.c b/src/fileio.c index a90111b22b6..e9a6c558e33 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -173,9 +173,6 @@ Lisp_Object Vdefault_file_name_coding_system; whose I/O is done with a special handler. */ Lisp_Object Vfile_name_handler_alist; -/* Format for auto-save files */ -Lisp_Object Vauto_save_file_format; - /* Lisp functions for translating file formats */ Lisp_Object Qformat_decode, Qformat_annotate_function; @@ -5372,8 +5369,8 @@ build_annotations (start, end) } /* Now do the same for annotation functions implied by the file-format */ - if (auto_saving && (!EQ (Vauto_save_file_format, Qt))) - p = Vauto_save_file_format; + if (auto_saving && (!EQ (current_buffer->auto_save_file_format, Qt))) + p = current_buffer->auto_save_file_format; else p = current_buffer->file_format; for (i = 0; CONSP (p); p = XCDR (p), ++i) @@ -6491,13 +6488,6 @@ instead use `file-name-coding-system' to get a constant encoding of file names regardless of the current language environment. */); Vdefault_file_name_coding_system = Qnil; - DEFVAR_LISP ("auto-save-file-format", &Vauto_save_file_format, - doc: /* *Format in which to write auto-save files. -Should be a list of symbols naming formats that are defined in `format-alist'. -If it is t, which is the default, auto-save files are written in the -same format as a regular save would use. */); - Vauto_save_file_format = Qt; - Qformat_decode = intern ("format-decode"); staticpro (&Qformat_decode); Qformat_annotate_function = intern ("format-annotate-function"); -- 2.39.2