(mime-edit-again): optional argument `code-conversion' was changed to

`not-decode-text' (behavior was reversed); optional argument `no-mode'
was renamed to `not-turn-on'; `mail-header-separator' was replaced to
null line before converting.

diff --git a/mime-edit.el b/mime-edit.el
index 1d7857c..f383e9e 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -7,7 +7,7 @@
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/08/21 renamed from mime.el
 ;;     Renamed: 1997/2/21 from tm-edit.el
-;; Version: $Revision: 0.67 $
+;; Version: $Revision: 0.68 $
 ;; Keywords: MIME, multimedia, multilingual, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -122,7 +122,7 @@
 ;;;
 
 (defconst mime-edit-RCS-ID
-  "$Id: mime-edit.el,v 0.67 1997-03-07 13:11:57 morioka Exp $")
+  "$Id: mime-edit.el,v 0.68 1997-03-07 13:41:46 morioka Exp $")
 
 (defconst mime-edit-version (get-version-string mime-edit-RCS-ID))
 
@@ -2539,22 +2539,21 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
          )
        ))))
 
-(defun mime-edit-again (&optional code-conversion no-separator no-mode)
+(defun mime-edit-again (&optional not-decode-text no-separator not-turn-on)
   "Convert current buffer to MIME-Edit buffer and turn on MIME-Edit mode.
 Content-Type and Content-Transfer-Encoding header fields will be
 converted to MIME-Edit tags."
   (interactive)
-  (mime-editor::edit-again code-conversion)
+  (goto-char (point-min))
+  (if (search-forward
+       (concat "\n" (regexp-quote mail-header-separator) "\n")
+       nil t)
+      (replace-match "\n\n")
+    )
+  (mime-editor::edit-again (not not-decode-text))
   (goto-char (point-min))
   (save-restriction
-    (narrow-to-region
-     (point-min)
-     (if (re-search-forward
-         (concat "^\\(" (regexp-quote mail-header-separator) "\\)?$")
-         nil t)
-        (match-end 0)
-       (point-max)
-       ))
+    (std11-narrow-to-header)
     (goto-char (point-min))
     (while (re-search-forward
            "^\\(Content-.*\\|Mime-Version\\):" nil t)
@@ -2564,7 +2563,7 @@ converted to MIME-Edit tags."
       (and (re-search-forward "^$")
           (replace-match mail-header-separator)
           ))
-  (or no-mode
+  (or not-turn-on
       (turn-on-mime-edit)
       ))