From: hmurata <hmurata>
Date: Sun, 17 Jul 2005 06:47:57 +0000 (+0000)
Subject: * wl-vars.el (wl-draft-additional-header-alist): Add into the
X-Git-Tag: wl-2_15_3~65
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8329755c08feaf910b4c3a546b8d2a7cabfbf863;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-draft-additional-header-alist): Add into the
customize group `wl-draft'.
(wl-draft-add-in-reply-to): Move customize group from `wl' to
`wl-draft'.
(wl-draft-add-references): Ditto.

* wl-action.el (wl-summary-print-argument): Rename argument from
`folder' to `data'.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index c648e92..e564c9c 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-17  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-vars.el (wl-draft-additional-header-alist): Add into the
+	customize group `wl-draft'.
+	(wl-draft-add-in-reply-to): Move customize group from `wl' to
+	`wl-draft'.
+	(wl-draft-add-references): Ditto.
+
+	* wl-action.el (wl-summary-print-argument): Rename argument from
+	`folder' to `data'.
+
 2005-06-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-summary.el (wl-summary-rescan-message): Call
diff --git a/wl/wl-action.el b/wl/wl-action.el
index 1207002..ada04ce 100644
--- a/wl/wl-action.el
+++ b/wl/wl-action.el
@@ -722,16 +722,16 @@ Return number if put mark succeed"
 				      fld))))
     fld))
 
-(defun wl-summary-print-argument (msg-num folder)
+(defun wl-summary-print-argument (msg-num data)
   "Print action argument on line."
-  (when folder
+  (when data
     (wl-summary-remove-argument)
     (save-excursion
       (let ((inhibit-read-only t)
-	    (folder (copy-sequence folder))
+	    (data (copy-sequence data))
 	    (buffer-read-only nil)
 	    len rs re c)
-	(setq len (string-width folder))
+	(setq len (string-width data))
 	(if (< len 1) ()
 	  ;;(end-of-line)
 	  (beginning-of-line)
@@ -744,7 +744,8 @@ Return number if put mark succeed"
 			      (1- (window-width)))))
 		(c (current-column))
 		(padding 0))
-	    (if (and width (> (+ c len) width))
+	    (if (and width
+		     (> (+ c len) width))
 		(progn
 		  (move-to-column width)
 		  (setq c (current-column))
@@ -752,18 +753,17 @@ Return number if put mark succeed"
 		    (forward-char -1)
 		    (setq c (current-column)))
 		  (when (< (+ c len) width)
-		    (setq folder (concat " " folder)))
+		    (setq data (concat " " data)))
 		  (setq rs (point))
 		  (put-text-property rs re 'invisible t))
 	      (when (and width
 			 (> (setq padding (- width len c)) 0))
-		(setq folder (concat (make-string padding ?\ )
-				     folder)))
+		(setq data (concat (make-string padding ?\ ) data)))
 	      (setq rs (1- re))))
 	  (put-text-property rs re 'wl-summary-action-argument t)
 	  (goto-char re)
-	  (wl-highlight-action-argument-string folder)
-	  (insert folder)
+	  (wl-highlight-action-argument-string data)
+	  (insert data)
 	  (set-buffer-modified-p nil))))))
 
 (defsubst wl-summary-reserve-temp-mark-p (mark)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index d3bbc14..a87f064 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -524,21 +524,22 @@ If nil, `wl-from' is used."
   "*Additional headers in the draft."
   :type '(repeat (cons (symbol :tag "Field Name")
 		       (choice (string :tag "String")
-			       (function :tag "Function")))))
+			       (function :tag "Function"))))
+  :group 'wl-draft)
 
 (defcustom wl-draft-add-in-reply-to t
   "*If non-nil, message-id of the cited message is inserted to the
 in-reply-to field of the current draft.
 Note: default value follows RFC2822."
   :type 'boolean
-  :group 'wl)
+  :group 'wl-draft)
 
 (defcustom wl-draft-add-references nil
   "*If non-nil, message-id of the cited message is inserted to the
 references field of the current draft.
 Note: default value follows RFC2822."
   :type 'boolean
-  :group 'wl)
+  :group 'wl-draft)
 
 (defcustom wl-draft-cite-function 'wl-default-draft-cite
   "*A function for citation."