2 files changed, 15 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ef7acb97eb4..b4a3e74c453 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Fwrite_region): Delay the defaulting to beg&z to after
+        calling build_annotations.
+
 2008-05-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * coding.c (Fdecode_coding_region, Fencode_coding_region)
diff --git a/src/fileio.c b/src/fileio.c
index c4b0113523a..2a700a69f97 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5079,8 +5079,11 @@ This does code conversion according to the value of
   /* Special kludge to simplify auto-saving.  */
   if (NILP (start))
     {
+      /* Do it later, so write-region-annotate-function can work differently
+         if we save "the buffer" vs "a region".
+         This is useful in tar-mode.  --Stef
       XSETFASTINT (start, BEG);
-      XSETFASTINT (end, Z);
+      XSETFASTINT (end, Z); */
       Fwiden ();
     }
 
@@ -5100,6 +5103,12 @@ This does code conversion according to the value of
         }
     }
 
+  if (NILP (start))
+    {
+      XSETFASTINT (start, BEGV);
+      XSETFASTINT (end, ZV);
+    }
+
   UNGCPRO;
 
   GCPRO5 (start, filename, annotations, visit_file, lockname);