abolish wl-summary-subject-length-limit

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 07de2cf..421c22d 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-09  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-vars.el (wl-summary-line-format): Change default value.
+       (wl-summary-subject-length-limit): Abolished.
+       * wl-summary.el (wl-summary-line-subject): Ditto.
+
 2002-10-09  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-template.el (wl-template-select): Added optional argument.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index a0c0095..cec5dc3 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4176,11 +4176,7 @@ If ARG, exit virtual folder."
       (while (< (string-width subject)
                wl-summary-line-subject-minimum-length)
        (setq subject (concat subject " "))))
-    (if (and (not wl-summary-width)
-            wl-summary-subject-length-limit)
-       (truncate-string subject
-                        wl-summary-subject-length-limit)
-      subject)))
+    subject))
 
 (defun wl-summary-line-from ()
   (elmo-delete-char ?\n

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 1886291..6d2f1ae 100644 (file)
--- 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%) %] %s"
+(defcustom wl-summary-line-format "%n%T%P%M/%D(%W)%h:%m %t%[%17(%c %f%) %] %36s"
   "*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:
@@ -1619,14 +1619,6 @@ with wl-highlight-folder-many-face."
                (string :tag "Other"))
   :group 'wl-summary)
 
-(defcustom wl-summary-subject-length-limit nil
-  "*Set subject width in summary when wl-summary-width is nil.
-Nil means unlimited"
-  :type '(choice (const :tag "Unlimited" nil)
-                integer)
-  :group 'wl-summary
-  :group 'wl-pref)
-
 (defcustom wl-mime-charset 'x-ctext
   "*MIME Charset for summary and message."
   :type 'symbol
@@ -2645,10 +2637,6 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 (elmo-define-obsolete-variable 'wl-tmp-dir
                               'wl-temporary-file-directory)
 
-;; 2001-12-07
-(elmo-define-obsolete-variable 'wl-subject-length-limit
-                              'wl-summary-subject-length-limit)
-
 ;; 2001-12-10
 (elmo-define-obsolete-variable 'wl-summary-update-confirm-threshold
                               'elmo-folder-update-threshold)