Mercurial > emacs
changeset 103918:74a905fff633
* 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.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 16 Jul 2009 01:52:32 +0000 |
| parents | aa5e8ff5a9c4 |
| children | ab3de87ae5a3 |
| files | lisp/ChangeLog lisp/files.el lisp/mail/rmail.el |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jul 16 01:45:08 2009 +0000 +++ b/lisp/ChangeLog Thu Jul 16 01:52:32 2009 +0000 @@ -1,3 +1,11 @@ +2009-07-16 Richard Stallman <rms@gnu.org> + + * 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 <jari.aalto@cante.net> * net/rcirc.el (rcirc): Use history variables.
--- a/lisp/files.el Thu Jul 16 01:45:08 2009 +0000 +++ b/lisp/files.el Thu Jul 16 01:52:32 2009 +0000 @@ -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)"
--- a/lisp/mail/rmail.el Thu Jul 16 01:45:08 2009 +0000 +++ b/lisp/mail/rmail.el Thu Jul 16 01:52:32 2009 +0000 @@ -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)