[mew-dist 19912] Re: 特定メールが+mdropで削除できない

[Tatsuya Kinoshita]

In message [mew-dist 19911], on Sat, 22 Dec 2001,
Kazu Yamamoto <kazu at example.com> wrote:

> X-Mew-Uidl を作る際に改行を消す方がよいように思います。

そのようにパッチを作りなおしました。

なお、mew-replace-white-spaceの修正は、.mew-cacheの乱れを防ぐ意味
があるので残してあります。(Mew 3では適用済み)

-- 
木下達也
-------------- next part --------------

 This patch is written by Tatsuya Kinoshita.  Copyright is disclaimed.

diff -cr mew-2.2rc1.orig/mew-func.el mew-2.2rc1/mew-func.el
*** mew-2.2rc1.orig/mew-func.el	Tue Dec 11 12:14:45 2001
--- mew-2.2rc1/mew-func.el	Fri Dec 21 14:10:53 2001
***************
*** 281,287 ****
  
  (defun mew-replace-white-space (string)
    "Replace white characters to a space."
!   (while (string-match "\t+" string)
      (setq string (replace-match " " nil t string)))
    (while (string-match "  +" string)
      (setq string (replace-match " " nil t string)))
--- 281,287 ----
  
  (defun mew-replace-white-space (string)
    "Replace white characters to a space."
!   (while (string-match "[\n\t]+" string)
      (setq string (replace-match " " nil t string)))
    (while (string-match "  +" string)
      (setq string (replace-match " " nil t string)))
diff -cr mew-2.2rc1.orig/mew-header.el mew-2.2rc1/mew-header.el
*** mew-2.2rc1.orig/mew-header.el	Fri Oct 26 14:19:15 2001
--- mew-2.2rc1/mew-header.el	Sat Dec 22 13:42:07 2001
***************
*** 167,173 ****
  (defsubst mew-draft-header-fill (field value)
    (unless (mew-header-existp field) (mew-draft-header-insert field value)))
  
! (defun mew-header-insert (key value)
    (if (and value (stringp key))
        (let ((beg (point)) params med par parname parval)
  	(when (listp value)
--- 167,173 ----
  (defsubst mew-draft-header-fill (field value)
    (unless (mew-header-existp field) (mew-draft-header-insert field value)))
  
! (defun mew-header-insert (key value &optional no-fold)
    (if (and value (stringp key))
        (let ((beg (point)) params med par parname parval)
  	(when (listp value)
***************
*** 196,202 ****
  	    (setq parname (concat parname "*"))))
  	  (insert " " parname "=" parval))
  	(insert "\n")
! 	(mew-header-fold-region beg (point) med))))
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;;
--- 196,203 ----
  	    (setq parname (concat parname "*"))))
  	  (insert " " parname "=" parval))
  	(insert "\n")
! 	(unless no-fold
! 	  (mew-header-fold-region beg (point) med)))))
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;;
diff -cr mew-2.2rc1.orig/mew-pop.el mew-2.2rc1/mew-pop.el
*** mew-2.2rc1.orig/mew-pop.el	Thu Dec  6 13:47:08 2001
--- mew-2.2rc1/mew-pop.el	Sat Dec 22 13:45:25 2001
***************
*** 802,809 ****
        (goto-char (point-min))
        (when uid
  	(if case
! 	    (mew-header-insert xmu (concat uid " " siz " " case))
! 	  (mew-header-insert xmu (concat uid " " siz)))))
      (catch 'write-error
        (condition-case nil
  	  (mew-frwlet 
--- 802,809 ----
        (goto-char (point-min))
        (when uid
  	(if case
! 	    (mew-header-insert xmu (concat uid " " siz " " case) 'no-fold)
! 	  (mew-header-insert xmu (concat uid " " siz) 'no-fold))))
      (catch 'write-error
        (condition-case nil
  	  (mew-frwlet