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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/07 03:04:01

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

Log message:
        (metamail-interpret-body): Remove Rmail-specific hack that is no
        longer appropriate to mbox Rmail.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15266&r2=1.15267
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/metamail.el?cvsroot=emacs&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15266
retrieving revision 1.15267
diff -u -b -r1.15266 -r1.15267
--- ChangeLog   6 Feb 2009 07:33:20 -0000       1.15266
+++ ChangeLog   7 Feb 2009 03:03:57 -0000       1.15267
@@ -1,3 +1,24 @@
+2009-02-07  Alex Schroeder  <address@hidden>
+
+       * mail/unrmail.el (unrmail): Use regexps to find message separators so
+       as not to match any fake rmime.el separators.  Remove any sections added
+       by rmime.el.
+
+2009-02-07  Glenn Morris  <address@hidden>
+
+       * mail/metamail.el (metamail-interpret-body): Remove Rmail-specific hack
+       that is no longer appropriate to mbox Rmail.
+
+       * mail/rmailsum.el (rmail-create-summary-line): Widen the view buffer
+       before trying to move to the start of the message.
+       (rmail-summary-undelete-many, rmail-summary-rmail-update):
+       Fix rmail-set-attribute calls.
+
+       * mail/sendmail.el (mail-bury-selects-summary, mail-yank-original):
+       Doc fix.
+       (rmail-output-to-rmail-buffer): Autoload it.
+       (mail-do-fcc): Give it a doc string.  Update for mbox Rmail, simplify.
+
 2009-02-06  Glenn Morris  <address@hidden>
 
        * mail/unrmail.el (unrmail): Use current-time-string.

Index: mail/metamail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/metamail.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- mail/metamail.el    5 Jan 2009 03:22:33 -0000       1.28
+++ mail/metamail.el    7 Feb 2009 03:04:00 -0000       1.29
@@ -121,11 +121,21 @@
             (append metamail-switches
                     (list "-b" "-c" contype "-E" encoding))))
        (metamail-region end (point-max) viewmode nil nodisplay))
-      ;; Mode specific hack.
-      (cond ((eq major-mode 'rmail-mode)
-            ;; Adjust the marker of this message if in Rmail mode buffer.
-            (set-marker (aref rmail-message-vector (1+ rmail-current-message))
-                        (point-max))))
+      ;; This mode specific hack is no longer appropriate in mbox Rmail.
+      ;; Pre-mbox, we have just modified the actual folder, so we
+      ;; update the message-vector with the new end position of the
+      ;; current message.  In mbox Rmail, all we have done is modify a
+      ;; display copy of the message.  Note also that point-max is a
+      ;; marker in the wrong buffer: the message-vector contains
+      ;; markers in rmail-view-buffer (which is not in rmail-mode).
+      ;; So this hack actually breaks the message-vector.
+      ;; If you're calling this on the actual rmail-view-buffer (or a
+      ;; non-swapped rmail-buffer), you would still need this hack.
+      ;; But you're not going to do that.
+;;;      (cond ((eq major-mode 'rmail-mode)
+;;;         ;; Adjust the marker of this message if in Rmail mode buffer.
+;;;         (set-marker (aref rmail-message-vector (1+ rmail-current-message))
+;;;                     (point-max))))
       )))
 
 ;;;###autoload