[Mew-dist 08191] patch2

[Kazu Yamamoto ( 山本和彦 )]

だめだぁ。これも当てて下さい。

だれか、再編集(E)を徹底的にテストして下さい。特にマルチパートのメール
をお願いします。(MIME-Version: を用意しなくなった代償は大きかった。)

1.95 では、マルチパートメールをまともに編集できる機能を提供します。
1.94 ではいいかげんな方法で許してちょ。

--かず＠Let's blame on the time difference!

-------------- next part --------------
Index: mew-draft.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-draft.el,v
retrieving revision 1.71
diff -c -r1.71 mew-draft.el
*** mew-draft.el	1999/03/18 23:09:20	1.71
--- mew-draft.el	1999/03/18 23:32:20
***************
*** 593,606 ****
    (run-hooks 'mew-send-hook)
    (if (mew-header-existp mew-ct:)
        (progn
! 	;; the separator still exits in the case of re-editing 
! 	;; a multipart message
! 	(mew-header-clear)
! 	(goto-char (mew-header-end))
! 	(let ((beg (point)) (inhibit-read-only t))
! 	  (forward-line)
! 	  (delete-region beg (point))
! 	  (insert "\n"))
  	(mew-draft-real-send-letter arg))
      (mew-draft-make-message)
      (condition-case nil
--- 593,599 ----
    (run-hooks 'mew-send-hook)
    (if (mew-header-existp mew-ct:)
        (progn
! 	(mew-draft-make-header 'modify)
  	(mew-draft-real-send-letter arg))
      (mew-draft-make-message)
      (condition-case nil
Index: mew-encode.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-encode.el,v
retrieving revision 1.58
diff -c -r1.58 mew-encode.el
*** mew-encode.el	1999/03/18 12:28:19	1.58
--- mew-encode.el	1999/03/18 23:32:20
***************
*** 55,61 ****
    (if mew-config-insert-when-composed
        (mew-draft-insert-config))
    (if (mew-header-existp mew-ct:)
!       (progn
  	(ding)
  	(message "%s already exists!" mew-ct:))
      (message "Making a MIME letter ...")
--- 55,62 ----
    (if mew-config-insert-when-composed
        (mew-draft-insert-config))
    (if (mew-header-existp mew-ct:)
!       (if (not (mew-header-existp mew-mv:))
! 	  (mew-draft-make-header 'modify)
  	(ding)
  	(message "%s already exists!" mew-ct:))
      (message "Making a MIME letter ...")
***************
*** 70,76 ****
      (mew-draft-make-header)
      (message "Making a MIME letter ... done")))
  
! (defun mew-draft-make-header ()
    ;; Removing the header separator and fix the marker.
    ;; Then RFC 2047 header encoding.
    (mew-header-clear) ;; this is unavoidable
--- 71,77 ----
      (mew-draft-make-header)
      (message "Making a MIME letter ... done")))
  
! (defun mew-draft-make-header (&optional modifyp)
    ;; Removing the header separator and fix the marker.
    ;; Then RFC 2047 header encoding.
    (mew-header-clear) ;; this is unavoidable
***************
*** 79,85 ****
    (let ((beg (point)) (inhibit-read-only t))
      (forward-line)
      (delete-region beg (point))
!     (mew-header-insert mew-mv: mew-mv:-num)
      (mew-header-clear) ;; this is unavoidable
      (goto-char (mew-header-end))
      (mew-header-encode-region (point-min) (point))
--- 80,88 ----
    (let ((beg (point)) (inhibit-read-only t))
      (forward-line)
      (delete-region beg (point))
!     (if (not (mew-header-existp mew-mv:))
! 	(mew-header-insert mew-mv: mew-mv:-num))
!     (if modifyp (insert "\n"))
      (mew-header-clear) ;; this is unavoidable
      (goto-char (mew-header-end))
      (mew-header-encode-region (point-min) (point))