[Emacs-diffs] emacs/lisp ChangeLog files.el mail/rmail.el mai...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/07/21 23:34:38

Modified files:
        lisp           : ChangeLog files.el 
        lisp/mail      : rmail.el rmailedit.el 

Log message:
        * mail/rmailedit.el (rmail-edit-mode): Use 
auto-save-include-big-deletions.
        
        * mail/rmail.el (rmail-variables): Use auto-save-include-big-deletions.
        
        * files.el (auto-save-mode): Revert 2009-07-21 and 2009-07-16 changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15844&r2=1.15845
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1062&r2=1.1063
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.537&r2=1.538
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailedit.el?cvsroot=emacs&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15844
retrieving revision 1.15845
diff -u -b -r1.15844 -r1.15845
--- ChangeLog   21 Jul 2009 19:00:02 -0000      1.15844
+++ ChangeLog   21 Jul 2009 23:34:33 -0000      1.15845
@@ -1,3 +1,14 @@
+2009-07-21  Chong Yidong  <address@hidden>
+
+       * mail/rmailedit.el (rmail-edit-mode): Use
+       auto-save-include-big-deletions.
+
+       * mail/rmail.el (rmail-variables): Use
+       auto-save-include-big-deletions.
+
+       * files.el (auto-save-mode): Revert 2009-07-21 and 2009-07-16
+       changes.
+
 2009-07-21  Jay Belanger  <address@hidden>
 
        * calc/calc.el (calc-undo-length): New variable.

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1062
retrieving revision 1.1063
diff -u -b -r1.1062 -r1.1063
--- files.el    21 Jul 2009 14:40:37 -0000      1.1062
+++ files.el    21 Jul 2009 23:34:37 -0000      1.1063
@@ -5005,7 +5005,7 @@
                 (or (not buffer-auto-save-file-name)
                     ;; If auto-save is off because buffer has shrunk,
                     ;; then toggling should turn it on.
-                    (= buffer-saved-size -1))
+                    (< buffer-saved-size 0))
               (or (eq arg t) (listp arg) (and (integerp arg) (> arg 0))))
             (if (and buffer-file-name auto-save-visited-file-name
                      (not buffer-read-only))
@@ -5013,7 +5013,7 @@
               (make-auto-save-file-name))))
   ;; If -1 was stored here, to temporarily turn off saving,
   ;; turn it back on.
-  (and (= buffer-saved-size -1)
+  (and (< buffer-saved-size 0)
        (setq buffer-saved-size 0))
   (if (interactive-p)
       (message "Auto-save %s (in this buffer)"

Index: mail/rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -b -r1.537 -r1.538
--- mail/rmail.el       21 Jul 2009 04:42:59 -0000      1.537
+++ mail/rmail.el       21 Jul 2009 23:34:37 -0000      1.538
@@ -1412,7 +1412,8 @@
   (setq local-enable-local-variables nil)
   ;; Don't turn off auto-saving based on the size of the buffer
   ;; because that code does not understand buffer-swapping.
-  (setq buffer-saved-size -2)
+  (make-local-variable 'auto-save-include-big-deletions)
+  (setq auto-save-include-big-deletions t)
   (make-local-variable 'revert-buffer-function)
   (setq revert-buffer-function 'rmail-revert)
   (make-local-variable 'font-lock-defaults)

Index: mail/rmailedit.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailedit.el,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- mail/rmailedit.el   17 May 2009 16:11:26 -0000      1.59
+++ mail/rmailedit.el   21 Jul 2009 23:34:38 -0000      1.60
@@ -64,6 +64,10 @@
     (if (boundp 'mode-line-modified)
        (setq mode-line-modified (default-value 'mode-line-modified))
       (setq mode-line-format (default-value 'mode-line-format)))
+    ;; Don't turn off auto-saving based on the size of the buffer
+    ;; because that code does not understand buffer-swapping.
+    (make-local-variable 'auto-save-include-big-deletions)
+    (setq auto-save-include-big-deletions t)
     ;; If someone uses C-x C-s, don't clobber the rmail file (bug#2625).
     (add-hook 'write-region-annotate-functions
              'rmail-write-region-annotate nil t)