From: yamaoka <yamaoka>
Date: Thu, 7 Mar 2002 08:58:48 +0000 (+0000)
Subject: * wl-draft.el (wl-draft-insert-x-face-field-here): Strip X-Face header if
X-Git-Tag: wl-2_9_8~19
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13b1d3b39f0a506176bc39fc3f36ca580fd9f615;p=elisp%2Fwanderlust.git

* wl-draft.el (wl-draft-insert-x-face-field-here): Strip X-Face header if
 the file `wl-x-face-file' already contains it.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 6d6eeb3..7ab55f5 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* wl-draft.el (wl-draft-insert-x-face-field-here): Strip X-Face
+	header if the file `wl-x-face-file' already contains it.
+
 2002-03-06  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* wl-folder.el (wl-folder-mode-menu-spec): Add "Write for current
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index d982ecb..3335091 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -199,7 +199,7 @@
 (defun wl-draft-insert-x-face-field-here ()
   "Insert X-Face field at point."
   (let ((x-face-string (elmo-get-file-string wl-x-face-file)))
-    (when (string-match "^[ \t]*" x-face-string)
+    (when (string-match "^\\(X-Face:\\)?[ \t\n]*" x-face-string)
       (setq x-face-string (substring x-face-string (match-end 0))))
     (insert "X-Face: " x-face-string))
   (when (not (= (preceding-char) ?\n))	; for chomped (choped) x-face-string