[Mew-dist 13019] Re: mew-1.95b35.tar.gz

[KAMEI Ken-ichi ( 亀井謙一 )]

亀井です。

reedit に関してですが、Dcc をはじめいろいろと mqi に保存はしてい
るのですが、まだ reedit 時にそれを読み込んでいないので駄目なよう
ですね。
# 現在は Config の値を挿入していると考えて良いのかな？

とはいえカズさんには thread のほうに力を注いでほしいなぁと暫定
patch です。
# mew-1.95b35 に当ててください

とりあえず、Bcc と Dcc を復元できるようにしてみました。トリッキー
なやり方なのでだれかまともなのを作ってください。m(__)m



何が酷いかって mew-summary-edit-message で mew-draft-bcc が初期
化されてしまうようなのだけど、だからといって、そのあと .mpi を読
み込みこもうと mew-smtp-insert-file を呼ぶと変な動きをするので 

(mew-smtp-insert-file (mew-expand-folder-get-msg fld msg))
(let (mew-draft-bcc mew-draft-dcc)
     (mew-summary-edit-message fld msg part syntax cache))

と拘束して逃げてしまっていることです。

その他いろいろあこぎな事をしているので、需要がある方のみ自己責任
でどうぞ。


-- kamei
-------------- next part --------------
diff -c mew-1.95b35/mew-edit.el.orig mew-1.95b35/mew-edit.el
*** mew-1.95b35/mew-edit.el.orig	Tue Apr 18 21:33:06 2000
--- mew-1.95b35/mew-edit.el	Sat May 20 05:33:28 2000
***************
*** 455,461 ****
       (mew-header-goto-end)
       (mew-draft-header-fill mew-from:     (mew-from))
       (mew-draft-header-fill mew-fcc:      (mew-fcc))
!      (mew-draft-header-fill mew-dcc:      (mew-dcc))
       (mew-draft-header-fill mew-reply-to: (mew-reply-to))
       (mew-draft-header-fill mew-x-mailer: mew-x-mailer))
     (mew-header-clear) ;; erase the old header separator
--- 455,476 ----
       (mew-header-goto-end)
       (mew-draft-header-fill mew-from:     (mew-from))
       (mew-draft-header-fill mew-fcc:      (mew-fcc))
! ;     (mew-draft-header-fill mew-bcc:      (mew-bcc))
! ;     (mew-draft-header-fill mew-dcc:      (mew-dcc))
!      (let (bcc (queue-bcc mew-draft-bcc))
!        (while queue-bcc
! 	 (if bcc
! 	     (setq bcc (concat bcc ", ")))
! 	 (setq bcc (concat bcc (car queue-bcc)))
! 	 (setq queue-bcc (cdr queue-bcc)))
!        (mew-draft-header-fill mew-bcc:      bcc))
!      (let (dcc (queue-dcc mew-draft-dcc))
!        (while queue-dcc
! 	 (if dcc
! 	     (setq dcc (concat dcc ", ")))
! 	 (setq dcc (concat dcc (car queue-dcc)))
! 	 (setq queue-dcc (cdr queue-dcc)))
!        (mew-draft-header-fill mew-dcc:      dcc))
       (mew-draft-header-fill mew-reply-to: (mew-reply-to))
       (mew-draft-header-fill mew-x-mailer: mew-x-mailer))
     (mew-header-clear) ;; erase the old header separator
***************
*** 520,526 ****
        (mew-current-set-window-config)
        (mew-window-configure (current-buffer) 'draft)
        ;; main part
!       (mew-summary-edit-message fld msg part syntax cache)
        (if killp
  	  (mew-queue-backup (mew-expand-folder-get-msg fld msg)))
        (mew-summary-edit-header)
--- 535,543 ----
        (mew-current-set-window-config)
        (mew-window-configure (current-buffer) 'draft)
        ;; main part
!       (mew-smtp-insert-file (mew-expand-folder-get-msg fld msg) t)
!       (let (mew-draft-bcc mew-draft-dcc)
!         (mew-summary-edit-message fld msg part syntax cache))
        (if killp
  	  (mew-queue-backup (mew-expand-folder-get-msg fld msg)))
        (mew-summary-edit-header)
diff -c mew-1.95b35/mew-smtp.el.orig mew-1.95b35/mew-smtp.el
*** mew-1.95b35/mew-smtp.el.orig	Fri May 19 12:50:36 2000
--- mew-1.95b35/mew-smtp.el	Sat May 20 05:36:20 2000
***************
*** 511,523 ****
  ;;; Next message
  ;;;
  
! (defun mew-smtp-insert-file (orig)
    (if (not (file-readable-p orig))
        ()
      (let* ((work (concat orig mew-queue-work-suffix))
  	   (info (concat orig mew-queue-info-suffix))
  	   buf syntax)
!       (rename-file orig work 'override)
        (mew-frwlet
         mew-cs-text-for-read mew-cs-dummy
         (setq buf (find-file-noselect work)))
--- 511,524 ----
  ;;; Next message
  ;;;
  
! (defun mew-smtp-insert-file (orig &optional ren)
    (if (not (file-readable-p orig))
        ()
      (let* ((work (concat orig mew-queue-work-suffix))
  	   (info (concat orig mew-queue-info-suffix))
  	   buf syntax)
!       (if (not ren)
!           (rename-file orig work 'override))
        (mew-frwlet
         mew-cs-text-for-read mew-cs-dummy
         (setq buf (find-file-noselect work)))