Merge changes from emacs-23 branch

[bpt/emacs.git] / lisp / mail / metamail.el

diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index fb29326..47326b6 100644 (file)
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -1,7 +1,7 @@
 ;;; metamail.el --- Metamail interface for GNU Emacs
 
 ;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
 ;; Keywords: mail, news, mime, multimedia
@@ -40,7 +40,6 @@
 (defgroup metamail nil
   "Metamail interface for Emacs."
   :group 'mail
-  :group 'hypermedia
   :group 'processes)
 
 (defcustom metamail-program-name "metamail"
@@ -121,11 +120,21 @@ Its header part is not interpreted at all."
             (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