[Mew-dist 16115] patch for mew-organization

[Tatsuya Kinoshita]

mew-organizationが効いていなかったので、修正しました。

なお、従来どおり、mew-organizationでなくmew-header-alistでも、
Organizationフィールドを挿入できるようにしています。

-- 
木下達也 (Tatsuya Kinoshita)
-------------- next part --------------

 This patch is written by Tatsuya Kinoshita.

 Permission is granted to use, copy, distribute, and/or modify it 
 without restriction.  There is NO WARRANTY.

diff -ur mew-1.95b101/mew-config.el mew-1.95b101-tats20010130/mew-config.el
--- mew-1.95b101/mew-config.el	Thu Jan 18 14:25:38 2001
+++ mew-1.95b101-tats20010130/mew-config.el	Tue Jan 30 15:31:52 2001
@@ -304,11 +304,14 @@
 	(mew-header-replace-value dcc  (mew-dcc  new-config))
 	(mew-header-replace-value mew-fcc:      (mew-fcc new-config))
 	(mew-header-replace-value mew-reply-to: (mew-reply-to new-config))
+	(mew-header-replace-value mew-organization:
+				  (mew-organization new-config))
 	(mew-header-delete-lines
 	 (mapcar (function car) (mew-header-alist old-config)))
+	(mew-header-delete-lines
+	 (mapcar (function car) (mew-header-alist new-config)))
 	(mew-header-goto-end)
-	(mew-draft-header-insert-alist
-	 (mew-header-alist mew-draft-buffer-config))
+	(mew-draft-header-insert-alist (mew-header-alist new-config))
 	(mew-highlight-header)
 	(if (null mew-header-message) (mew-draft-header-keymap)))
       (save-buffer))))
diff -ur mew-1.95b101/mew-const.el mew-1.95b101-tats20010130/mew-const.el
--- mew-1.95b101/mew-const.el	Fri Jan 26 18:20:24 2001
+++ mew-1.95b101-tats20010130/mew-const.el	Tue Jan 30 15:30:29 2001
@@ -48,6 +48,7 @@
 (defconst mew-resent-message-id: "Resent-Message-Id:")
 
 (defconst mew-reply-to:    "Reply-To:")
+(defconst mew-organization: "Organization:")
 (defconst mew-newsgroups:  "Newsgroups:")
 (defconst mew-followup-to: "Followup-To:")
 
diff -ur mew-1.95b101/mew-draft.el mew-1.95b101-tats20010130/mew-draft.el
--- mew-1.95b101/mew-draft.el	Tue Jan 23 20:26:09 2001
+++ mew-1.95b101-tats20010130/mew-draft.el	Tue Jan 30 15:41:02 2001
@@ -358,6 +358,8 @@
 	  (mew-draft-header-insert mew-x-face: xface)))
     (mew-draft-header-insert mew-x-mailer: mew-x-mailer)
     (setq body (mew-draft-header-insert-alist other-headers))
+    (mew-draft-header-insert mew-organization: (mew-organization case))
+    (mew-header-delete-lines (mapcar (function car) (mew-header-alist case)))
     (mew-draft-header-insert-alist (mew-header-alist case))
     (mew-header-prepared)
     ;; on the body
diff -ur mew-1.95b101/mew-edit.el mew-1.95b101-tats20010130/mew-edit.el
--- mew-1.95b101/mew-edit.el	Mon Jan 29 15:23:02 2001
+++ mew-1.95b101-tats20010130/mew-edit.el	Tue Jan 30 15:33:41 2001
@@ -72,7 +72,8 @@
      (mew-draft-header-insert mew-cc: (mew-cc case))
      (mew-draft-header-insert mew-from: (mew-from case))
      (mew-draft-header-insert mew-fcc: (mew-fcc case))
-     (mew-draft-header-insert mew-dcc: (mew-dcc case)))))
+     (mew-draft-header-insert mew-dcc: (mew-dcc case))
+     (mew-draft-header-insert mew-organization: (mew-organization case)))))
 
 (defun mew-summary-resend ()
   (interactive)
diff -ur mew-1.95b101/mew-vars.el mew-1.95b101-tats20010130/mew-vars.el
--- mew-1.95b101/mew-vars.el	Mon Jan 29 15:23:03 2001
+++ mew-1.95b101-tats20010130/mew-vars.el	Tue Jan 30 15:34:52 2001
@@ -1255,7 +1255,7 @@
       `(,mew-received: "Return-Path:" "Delivery-Date:" "Delivered-To:"
 	,mew-date: ,mew-message-id: ,mew-from: ,mew-sender: ,mew-x-mailer:
 	,mew-mv: ,mew-ct: ,mew-cte: ,mew-reply-to: ,mew-dcc: ,mew-fcc:
-	"Precedence:" "Organization:" "X-"
+	"Precedence:" ,mew-organization: "X-"
 	"Lines:" "Status:" "Posted:" "Forwarded:" "Replied:" "X-UIDL:"))
   "*A field list to be deleted when edit again."
   :group 'mew-draft
@@ -1263,7 +1263,7 @@
 
 (defcustom mew-field-delete-for-others
   `(,mew-received: "Return-Path:" "Delivery-Date:" "Delivered-To:"
-    ,mew-to: ,mew-cc: ,mew-from:
+    ,mew-to: ,mew-cc: ,mew-from: ,mew-organization:
     "Lines:" "Status:" "Posted:" "Forwarded:" "Replied:" "X-UIDL:")
   "*A field list to be deleted when send with different To: and Cc:."
   :group 'mew-draft