From: yoichi <yoichi>
Date: Thu, 10 Oct 2002 08:53:57 +0000 (+0000)
Subject: * wl-vars.el (wl-summary-line-format): Undo last change.
X-Git-Tag: wl-2_11_1~110
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=4b6a2d35b847d799201e43e3bf381bdd2774a46e;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-summary-line-format): Undo last change.
* wl-summary.el (wl-summary-print-destination): Do not put
invisible property when `wl-summary-width' is nil.
(wl-summary-line-subject-minimum-length): Abolished.
(wl-summary-line-subject): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 421c22d..d021a24 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-10  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-vars.el (wl-summary-line-format): Undo last change.
+	* wl-summary.el (wl-summary-print-destination): Do not put
+	invisible property when `wl-summary-width' is nil.
+	(wl-summary-line-subject-minimum-length): Abolished.
+	(wl-summary-line-subject): Ditto.
+
 2002-10-09  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* wl-vars.el (wl-summary-line-format): Change default value.
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index cec5dc3..2ca0fd9 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -3174,7 +3174,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 	(setq c (+ c (char-width (following-char)))))
       (and (> c len) (setq folder (concat " " folder)))
       (setq rs (point))
-      (put-text-property rs re 'invisible t)
+      (when wl-summary-width
+	  (put-text-property rs re 'invisible t))
       (put-text-property rs re 'wl-summary-destination t)
       (goto-char re)
       (wl-highlight-refile-destination-string folder)
@@ -4148,7 +4149,6 @@ If ARG, exit virtual folder."
 	 (t (format "%dB" size)))
       "")))
 
-(defvar wl-summary-line-subject-minimum-length nil)
 (defun wl-summary-line-subject ()
   (let (no-parent subject parent-raw-subject parent-subject)
     (if (string= wl-thr-indent-string "")
@@ -4163,20 +4163,12 @@ If ARG, exit virtual folder."
     (setq parent-subject
 	  (if parent-raw-subject
 	      (elmo-delete-char ?\n parent-raw-subject)))
-    (setq subject
-	  (if (or no-parent
-		  (null parent-subject)
-		  (not (wl-summary-subject-equal
-			subject parent-subject)))
-	      (funcall wl-summary-subject-function subject)
-	    ""))
-    (when (and wl-summary-line-subject-minimum-length
-	       (< (string-width subject)
-		  wl-summary-line-subject-minimum-length))
-      (while (< (string-width subject)
-		wl-summary-line-subject-minimum-length)
-	(setq subject (concat subject " "))))
-    subject))
+    (if (or no-parent
+	    (null parent-subject)
+	    (not (wl-summary-subject-equal
+		  subject parent-subject)))
+	(funcall wl-summary-subject-function subject)
+      "")))
 
 (defun wl-summary-line-from ()
   (elmo-delete-char ?\n
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 6d2f1ae..187721e 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -251,7 +251,7 @@ Each element is a list of following:
 SPEC is a character for format specification.
 STRING-EXP is an expression to get string to insert.")
 
-(defcustom wl-summary-line-format "%n%T%P%M/%D(%W)%h:%m %t%[%17(%c %f%) %] %36s"
+(defcustom wl-summary-line-format "%n%T%P%M/%D(%W)%h:%m %t%[%17(%c %f%) %] %s"
   "*A default format string for summary line of Wanderlust.
 It may include any of the following format specifications
 which are replaced by the given information: