From: teranisi <teranisi>
Date: Mon, 29 Oct 2001 15:31:58 +0000 (+0000)
Subject: * wl-message.el (wl-message-add-buttons-to-body): Exchenged 3rd and 4th element.
X-Git-Tag: wl-2_7_6~7
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1159ed3f0d564da1dfd08e875f04b51e7c32f7d2;p=elisp%2Fwanderlust.git

* wl-message.el (wl-message-add-buttons-to-body): Exchenged 3rd and 4th element.
* wl-vars.el (wl-message-body-button-alist): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3422d88..9c1da19 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,9 @@
 2001-10-29  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-message.el (wl-message-add-buttons-to-body): Exchenged 3rd and 4th
+	element.
+	* wl-vars.el (wl-message-body-button-alist): Ditto.
+
 	* wl-vars.el (wl-message-body-button-alist): Set 4th element as the
 	max match length.
 	(Pointed out by Akihiro MOTOKI <amotoki@dd.iij4u.or.jp>.)
diff --git a/wl/wl-message.el b/wl/wl-message.el
index eec9b89..cde7f31 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -376,13 +376,13 @@ Returns non-nil if bottom of message."
 	  (setq entry (car alist)
 		alist (cdr alist))
 	  (goto-char (point-min))
-	  (while (re-search-forward (car entry) (+ (point) (nth 3 entry)) t)
+	  (while (re-search-forward (car entry) (+ (point) (nth 4 entry)) t)
 	    (unless (get-text-property (point) 'keymap)
 	      (wl-message-add-button
 	       (match-beginning (nth 1 entry))
 	       (match-end (nth 1 entry))
 	       (nth 2 entry)
-	       (match-string (nth 4 entry))))))))))
+	       (match-string (nth 3 entry))))))))))
   
 (defun wl-message-add-buttons-to-header (start end)
   (save-excursion
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index a84d3ae..ca00dba 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1227,17 +1227,17 @@ Each elements are regexp of field-name."
   :group 'wl-pref)
 
 (defcustom wl-message-body-button-alist
-  '(("<mailto:[^>]+>" 0 'ignore 1024 0)
-    ("<[^>]+@[^>]+>" 0 wl-message-button-refer-article 1024 0))
+  '(("<mailto:[^>]+>" 0 'ignore 0 1024)
+    ("<[^>]+@[^>]+>" 0 wl-message-button-refer-article 0 1024))
   "Alist of regexps to match buttons in message body."
   :type '(repeat
 	  (list regexp
 		(integer :tag "Button")
 		(function :tag "Callback")
-		(integer :tag "Max Length")
 		(repeat :tag "Data"
 			:inline t
-			(integer :tag "Regexp group"))))
+			(integer :tag "Regexp group"))
+		(integer :tag "Max Length")))
   :group 'wl-pref)
 
 (defcustom wl-folder-window-width 20