[mew-dist 28236] reedit での xface 挿入

[Takashi Masuda ( 増田貴士 )]

増田です。

`E' で reedit した時に、~/.xface が挿入されなかったので、ちょっと修正し
てみました。取り込んで頂けますでしょうか？

よろしくお願いします。

--
Takashi Masuda <masutaka at example.com>
-------------- next part --------------
Index: mew-config.el
===================================================================
RCS file: /cvsmew/mew/mew-config.el,v
retrieving revision 1.106
diff -u -r1.106 mew-config.el
--- mew-config.el	21 Mar 2008 08:12:24 -0000	1.106
+++ mew-config.el	26 Mar 2008 13:58:42 -0000
@@ -552,6 +552,7 @@
       (mew-header-delete-lines (mapcar 'car (mew-header-alist new-case)))
       (mew-header-delete-lines (list mew-x-mailer:))
       (mew-header-goto-end)
+      (mew-draft-header-insert-xface)
       (mew-draft-header-insert-alist (mew-header-alist new-case))
       ;; X-Mailer: must be the last
       (mew-draft-header-insert mew-x-mailer: mew-x-mailer))))
Index: mew-draft.el
===================================================================
RCS file: /cvsmew/mew/mew-draft.el,v
retrieving revision 1.142
diff -u -r1.142 mew-draft.el
--- mew-draft.el	21 Mar 2008 08:12:24 -0000	1.142
+++ mew-draft.el	26 Mar 2008 13:58:42 -0000
@@ -264,14 +264,7 @@
     (unless newsgroups
       (mew-draft-header-insert mew-in-reply-to: in-reply-to))
     (mew-draft-header-insert mew-references: references)
-    (if (and mew-x-face-file
-	     (file-exists-p (expand-file-name mew-x-face-file)))
-	(let (xface)
-	  (with-temp-buffer
-	    (mew-insert-file-contents (expand-file-name mew-x-face-file))
-	    (setq xface (mew-buffer-substring (point-min)
-					      (max (buffer-size) 1))))
-	  (mew-draft-header-insert mew-x-face: xface)))
+    (mew-draft-header-insert-xface)
     (mew-draft-header-insert mew-organization: (mew-organization case))
     (setq body (mew-draft-header-insert-alist other-headers))
     ;; Deleting fields defined in mew-header-alist to replace them.
Index: mew-header.el
===================================================================
RCS file: /cvsmew/mew/mew-header.el,v
retrieving revision 1.42
diff -u -r1.42 mew-header.el
--- mew-header.el	18 Mar 2008 03:04:57 -0000	1.42
+++ mew-header.el	26 Mar 2008 13:58:42 -0000
@@ -186,6 +186,16 @@
   "No encoding. Just insert."
   (if (and value (stringp field)) (insert field " " value "\n")))
 
+(defun mew-draft-header-insert-xface ()
+  (if (and mew-x-face-file
+	   (file-exists-p (expand-file-name mew-x-face-file)))
+      (let (xface)
+	(with-temp-buffer
+	  (mew-insert-file-contents (expand-file-name mew-x-face-file))
+	  (setq xface (mew-buffer-substring (point-min)
+					    (max (buffer-size) 1))))
+	(mew-draft-header-insert mew-x-face: xface))))
+
 (defun mew-draft-header-fill (field value)
   (unless (mew-header-existp field) (mew-draft-header-insert field value)))