diff src/buffer.c @ 83202:42acc7fa8a4f

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-529 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-530 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-531 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-532 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-533 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-534 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-535 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-536 sync-tree with gnus--rel--5.10 * [e-mail]--gnu-2004/gnus--devo--0--patch-2 Add {arch}/=cvs-sync-make-log * [e-mail]--gnu-2004/gnus--rel--5.8--base-0 Import from Gnus CVS branch V5-8 * [e-mail]--gnu-2004/gnus--rel--5.8--patch-1 {arch}/=tagging-method: Add CVS and autoconf grot to junk regexp * [e-mail]--gnu-2004/gnus--rel--5.8--patch-2 Use explicit tags for autoconf input files * [e-mail]--gnu-2004/gnus--rel--5.8--patch-3 Remove RCS keywords * [e-mail]--gnu-2004/gnus--rel--5.8--patch-4 Fix copied explicit id-tags * [e-mail]--gnu-2004/gnus--rel--5.8--patch-5 Add {arch}/=cvs-sync-make-log * [e-mail]--gnu-2004/gnus--rel--5.8--patch-6 configure.in: Use ifelse instead of m4_if for arch-tag: comment * [e-mail]--gnu-2004/gnus--rel--5.10--base-0 tag of [e-mail]--gnu-2004/gnus--rel--5.8--base-0 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-1 Gnus 5.10, from CVS branch v5-10 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-2 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-3 Use explicit tags for autoconf input files * [e-mail]--gnu-2004/gnus--rel--5.10--patch-4 sync-tree with gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-5 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-6 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-7 Remove RCS keywords * [e-mail]--gnu-2004/gnus--rel--5.10--patch-8 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-9 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-10 Add {arch}/=cvs-sync-make-log * [e-mail]--gnu-2004/gnus--rel--5.10--patch-11 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-12 Update from CVS: make.bat: Fix line endings around arch-tag. * [e-mail]--gnu-2004/gnus--rel--5.10--patch-13 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-14 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-15 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-16 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-17 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-242

--- a/src/buffer.c	Mon Sep 06 07:53:44 2004 +0000
+++ b/src/buffer.c	Fri Sep 10 13:06:10 2004 +0000
@@ -694,6 +694,7 @@
   b->mark_active = Qnil;
   b->point_before_scroll = Qnil;
   b->file_format = Qnil;
+  b->auto_save_file_format = Qt;
   b->last_selected_window = Qnil;
   XSETINT (b->display_count, 0);
   b->display_time = Qnil;
@@ -4962,6 +4963,7 @@
   buffer_defaults.undo_list = Qnil;
   buffer_defaults.mark_active = Qnil;
   buffer_defaults.file_format = Qnil;
+  buffer_defaults.auto_save_file_format = Qt;
   buffer_defaults.overlays_before = NULL;
   buffer_defaults.overlays_after = NULL;
   buffer_defaults.overlay_center = BEG;
@@ -5020,6 +5022,7 @@
   XSETINT (buffer_local_flags.file_truename, -1);
   XSETINT (buffer_local_flags.invisibility_spec, -1);
   XSETINT (buffer_local_flags.file_format, -1);
+  XSETINT (buffer_local_flags.auto_save_file_format, -1);
   XSETINT (buffer_local_flags.display_count, -1);
   XSETINT (buffer_local_flags.display_time, -1);
   XSETINT (buffer_local_flags.enable_multibyte_characters, -1);
@@ -5830,6 +5833,13 @@
 Formats are defined by `format-alist'.  This variable is
 set when a file is visited.  */);
 
+  DEFVAR_PER_BUFFER ("buffer-auto-save-file-format",
+		     &current_buffer->auto_save_file_format, Qnil,
+		     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.  */);
+
   DEFVAR_PER_BUFFER ("buffer-invisibility-spec",
 		     &current_buffer->invisibility_spec, Qnil,
 		     doc: /* Invisibility spec of this buffer.