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

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       09/04/09 16:48:29

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

Log message:
        * mail/rmailout.el (rmail-output): If file is visited,
        check the buffer's format.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15569&r2=1.15570
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailout.el?cvsroot=emacs&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15569
retrieving revision 1.15570
diff -u -b -r1.15569 -r1.15570
--- ChangeLog   9 Apr 2009 16:46:02 -0000       1.15569
+++ ChangeLog   9 Apr 2009 16:48:25 -0000       1.15570
@@ -1,5 +1,8 @@
 2009-04-09  Richard M Stallman  <address@hidden>
 
+       * mail/rmailout.el (rmail-output): If file is visited,
+       check the buffer's format.
+
        * mail/rmailout.el (rmail-convert-to-babyl-format): Don't set "unseen".
 
        * mail/rmailout.el (rmail-output-to-rmail-buffer):

Index: mail/rmailout.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmailout.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- mail/rmailout.el    9 Apr 2009 16:46:05 -0000       1.100
+++ mail/rmailout.el    9 Apr 2009 16:48:28 -0000       1.101
@@ -434,7 +434,20 @@
   (if noattribute (setq noattribute 'nomsg))
   (let ((babyl-format (and (file-readable-p file-name)
                           (mail-file-babyl-p file-name)))
-       (cur (current-buffer)))
+       (cur (current-buffer))
+       (buf (find-buffer-visiting file-name)))
+
+    ;; If a babyl file is visited in a buffer, is it visited as babyl
+    ;; or as mbox?
+    (and babyl-format buf
+        (with-current-buffer buf
+          (save-restriction
+            (widen)
+            (save-excursion
+              (goto-char (point-min))
+              (setq babyl-format
+                    (looking-at "BABYL OPTIONS:"))))))
+
     (if not-rmail               ; eg via message-fcc-handler-function
        (with-temp-buffer
          (insert-buffer-substring cur)