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

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       09/07/16 01:52:37

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

Log message:
        * files.el (auto-save-mode): If buffer-saved-size is -2, don't clobber 
it.
        
        * mail/rmail.el (rmail-variables): Set buffer-saved-size to -2.
        (rmail-retry-ignored-headers): Add more uninteresting fields.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15812&r2=1.15813
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1055&r2=1.1056
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.535&r2=1.536

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15812
retrieving revision 1.15813
diff -u -b -r1.15812 -r1.15813
--- ChangeLog   15 Jul 2009 15:07:39 -0000      1.15812
+++ ChangeLog   16 Jul 2009 01:52:32 -0000      1.15813
@@ -1,3 +1,11 @@
+2009-07-16  Richard Stallman  <address@hidden>
+
+       * files.el (auto-save-mode): If buffer-saved-size is -2,
+       don't clobber it.
+
+       * mail/rmail.el (rmail-variables): Set buffer-saved-size to -2.
+       (rmail-retry-ignored-headers): Add more uninteresting fields.
+
 2009-07-15  Jari Aalto  <address@hidden>
 
        * net/rcirc.el (rcirc): Use history variables.

Index: files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.1055
retrieving revision 1.1056
diff -u -b -r1.1055 -r1.1056
--- files.el    5 Jul 2009 22:15:37 -0000       1.1055
+++ files.el    16 Jul 2009 01:52:36 -0000      1.1056
@@ -4996,7 +4996,7 @@
               (make-auto-save-file-name))))
   ;; If -1 was stored here, to temporarily turn off saving,
   ;; turn it back on.
-  (and (< buffer-saved-size 0)
+  (and (= buffer-saved-size -1)
        (setq buffer-saved-size 0))
   (if (interactive-p)
       (message "Auto-save %s (in this buffer)"

Index: mail/rmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -b -r1.535 -r1.536
--- mail/rmail.el       18 May 2009 16:27:00 -0000      1.535
+++ mail/rmail.el       16 Jul 2009 01:52:36 -0000      1.536
@@ -371,7 +371,7 @@
   :group 'rmail-headers)
 
 ;;;###autoload
-(defcustom rmail-retry-ignored-headers 
"^x-authentication-warning:\\|content-type:\\|content-transfer-encoding:\\|mime-version:"
+(defcustom rmail-retry-ignored-headers 
"^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:"
   "Headers that should be stripped when retrying a failed message."
   :type '(choice regexp (const nil :tag "None"))
   :group 'rmail-headers
@@ -1410,6 +1410,9 @@
   ;; Don't let a local variables list in a message cause confusion.
   (make-local-variable 'local-enable-local-variables)
   (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 'revert-buffer-function)
   (setq revert-buffer-function 'rmail-revert)
   (make-local-variable 'font-lock-defaults)