[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100052: Fix message-mode bug with fcc to Rmail buffers.

[Glenn Morris]

------------------------------------------------------------
revno: 100052
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-09-20 20:11:34 -0700
message:
  Fix message-mode bug with fcc to Rmail buffers.
  
  * lisp/gnus/message.el (message-output): Use gnus-output-to-rmail if a
  buffer is visiting the fcc file in rmail-mode.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-04-22 23:41:53 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-21 03:11:34 +0000
@@ -1,3 +1,8 @@
+2010-09-21  Glenn Morris  <address@hidden>
+
+       * message.el (message-output): Use gnus-output-to-rmail if a buffer is
+       visiting the fcc file in rmail-mode.
+
 2010-04-22  Andreas Seltenreich  <address@hidden>
 
        * message.el (message-generate-headers): Record insertion of optional

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-04-22 23:41:53 +0000
+++ b/lisp/gnus/message.el      2010-09-21 03:11:34 +0000
@@ -5311,8 +5311,14 @@
 
 (defun message-output (filename)
   "Append this article to Unix/babyl mail file FILENAME."
-  (if (and (file-readable-p filename)
-          (mail-file-babyl-p filename))
+  (if (or (and (file-readable-p filename)
+              (mail-file-babyl-p filename))
+         ;; gnus-output-to-mail does the wrong thing with live, mbox
+         ;; Rmail buffers in Emacs 23.
+         ;; http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255
+         (let ((buff (find-buffer-visiting filename)))
+           (and buff (with-current-buffer buff
+                       (eq major-mode 'rmail-mode)))))
       (gnus-output-to-rmail filename t)
     (gnus-output-to-mail filename t)))