Try to fix bug#5314. This is probably not the final word, tho.

* buffer.c (Fset_buffer_modified_p): Try and be careful not to modify
recent-auto-save-p as a side-effect.
* buffer.h (BUF_AUTOSAVE_MODIFF): New macro.
* buffer.c (Fkill_buffer, reset_buffer):
* editfns.c (Fsubst_char_in_region):
* fileio.c (Finsert_file_contents, Fdo_auto_save)
(Fset_buffer_auto_saved, Frecent_auto_save_p): Use it.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 58e13b1ed7c..00ac0ca0fa9 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1,7 +1,7 @@
 /* Lisp functions pertaining to editing.
    Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2870,8 +2870,8 @@ Both characters must have the same length of multi-byte form.  */)
                 {
                   if (MODIFF - 1 == SAVE_MODIFF)
                     SAVE_MODIFF++;
-                  if (MODIFF - 1 == current_buffer->auto_save_modified)
-                    current_buffer->auto_save_modified++;
+                  if (MODIFF - 1 == BUF_AUTOSAVE_MODIFF (current_buffer))
+                    BUF_AUTOSAVE_MODIFF (current_buffer)++;
                 }
 
               /* The before-change-function may have moved the gap