Change bahavior of wl-summary-width and wl-summary-indent-length-limit.
authoryoichi <yoichi>
Fri, 7 Dec 2001 11:35:37 +0000 (11:35 +0000)
committeryoichi <yoichi>
Fri, 7 Dec 2001 11:35:37 +0000 (11:35 +0000)
Change variables name:
 wl-from-width -> wl-summary-from-width
 wl-subject-length-limit -> wl-summary-subject-length-limit

doc/wl-ja.texi
doc/wl.texi
samples/en/dot.wl
samples/ja/dot.wl
wl/ChangeLog
wl/wl-summary.el
wl/wl-thread.el
wl/wl-vars.el

index f69ef3f..d2a2cbf 100644 (file)
@@ -3510,16 +3510,6 @@ Non-nil \e$B$J$i!"\e(B@samp{^L} \e$B$G2~%Z!<%8$7$F%a%C%;!<%8$rI=<($7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B '(1 . 4)\e$B!#\e(B
 \e$B%5%^%j$rI=<($9$k%&%#%s%I%&$H%a%C%;!<%8K\BN$rI=<($9$k%&%#%s%I%&$NHf$r\e(B cons \e$B$G;XDj$7$^$9!#\e(Bcar:cdr \e$B$,\e(B \e$B%5%^%j\e(B:\e$B%a%C%;!<%8\e(B \e$B$G$9!#\e(B
 
-@item wl-summary-recenter
-@vindex  wl-summary-recenter
-\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i$PI=<($7$?$H$-$KI=<(Cf$N%a%C%;!<%8$N%5\e(B
-\e$B%^%j9T$r%&%#%s%I%&$NCf1{IU6a$K0\F0$5$;$^$9!#\e(B
-
-@item wl-summary-indent-length-limit
-@vindex  wl-summary-indent-length-limit
-\e$B=i4|@_Dj$O\e(B 46\e$B!#@_Dj$5$l$?CM0J>e%5%^%j$r%$%s%G%s%H$7$^$;$s!#\e(B@code{nil} \e$B$J\e(B
-\e$B$i%5%^%j$N%$%s%G%s%H$rL5@)8B$K$7$^$9!#\e(B
-
 @item wl-summary-no-from-message
 @vindex  wl-summary-no-from-message
 \e$B=i4|@_Dj$O\e(B @samp{nobody@@nowhere?}\e$B!#\e(B
@@ -3530,11 +3520,6 @@ Non-nil \e$B$J$i!"\e(B@samp{^L} \e$B$G2~%Z!<%8$7$F%a%C%;!<%8$rI=<($7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B @samp{(WL:No Subject in original.)}\e$B!#%a%C%;!<%8$K\e(B 
 @samp{Subject:} \e$B$,L5$+$C$?>l9g$K%5%^%j$KI=<($9$kJ8;zNs$G$9!#\e(B
 
-@item wl-summary-width
-@vindex  wl-summary-width
-\e$B=i4|@_Dj$O\e(B 80\e$B!#%5%^%j$NI=<(I}$r@_Dj$5$l$?CM$K@Z$j5M$a$^$9!#\e(B@code{nil} \e$B$J\e(B
-\e$B$iI=<(I}$r@Z$j5M$a$^$;$s!#\e(B
-
 @item wl-summary-use-frame
 @vindex wl-summary-use-frame
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
@@ -3571,10 +3556,32 @@ petname \e$B$G$bJd40$,$G$-$^$9!#\e(B
 @kbd{n}, @kbd{N} \e$B$N7k2L$G!"<!$N%a%C%;!<%8$,>e$+2<$+$r@Z$jBX$($k!#FI$s$G\e(B
 \e$B$$$kJ}8~$r0U<1$7$?$$$H$-$O\e(B @code{t} \e$B$K$9$k$HNI$$$G$7$g$&!#\e(B
 
-@item wl-from-width
-@vindex wl-from-width
+@item wl-summary-width
+@vindex  wl-summary-width
+\e$B=i4|@_Dj$O\e(B 80\e$B!#%5%^%j$NI=<(I}$r@_Dj$5$l$?CM$K@Z$j5M$a$^$9!#\e(B@code{nil} \e$B$J\e(B
+\e$B$iI=<(I}$r@Z$j5M$a$^$;$s!#\e(B
+
+@item wl-summary-from-width
+@vindex wl-summary-from-width
 \e$B=i4|@_Dj$O\e(B 17\e$B!#%5%^%j$N\e(B From \e$BItJ,$NI=<(I}$G$9!#\e(B
 
+@item wl-summary-subject-length-limit
+@vindex wl-summary-subject-length-limit
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#%5%^%j$N\e(B Subject \e$BItJ,$NI=<(I}$N>e8B$G$9!#\e(B
+@code{nil} \e$B$N>l9g!"\e(BSubject \e$BItJ,$ND9$5$N@)8B$r$7$^$;$s!#\e(B
+
+@item wl-summary-indent-length-limit
+@vindex  wl-summary-indent-length-limit
+\e$B=i4|@_Dj$O\e(B 46\e$B!#@_Dj$5$l$?CM0J>e%5%^%j$r%$%s%G%s%H$7$^$;$s!#\e(B@code{nil} \e$B$J\e(B
+\e$B$i%5%^%j$N%$%s%G%s%H$rL5@)8B$K$7$^$9!#\e(B
+\e$BCM$r\e(B @code{nil} \e$B$K$9$k$H$-$O!"\e(B@code{wl-summary-width} \e$B$b\e(B @code{nil} \e$B$K@_Dj\e(B
+\e$B$9$k$H$h$$$G$7$g$&!#\e(B
+
+@item wl-summary-recenter
+@vindex  wl-summary-recenter
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i$PI=<($7$?$H$-$KI=<(Cf$N%a%C%;!<%8$N%5\e(B
+\e$B%^%j9T$r%&%#%s%I%&$NCf1{IU6a$K0\F0$5$;$^$9!#\e(B
+
 @item wl-summary-divide-thread-when-subject-changed
 @vindex wl-summary-divide-thread-when-subject-changed
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
index 7d313aa..1435fef 100644 (file)
@@ -3521,17 +3521,6 @@ The initial setting is '(1 . 4).
 A cons cell to specify the rate of summary and message window.
 car:cdr corresponds summary:message.
 
-@item wl-summary-recenter
-@vindex  wl-summary-recenter
-The initial setting is t.
-If non-nil, cursor point is moved to the center of the summary window.
-
-@item wl-summary-indent-length-limit
-@vindex  wl-summary-indent-length-limit
-The initial setting is 46.
-Specify the limit of thread indent level.
-If nil, max indent level is unlimited.
-
 @item wl-summary-no-from-message
 @vindex  wl-summary-no-from-message
 The initial setting is @samp{nobody@@nowhere?}.  A string which is
@@ -3542,11 +3531,6 @@ displayed when there's no @samp{From:} field in the message.
 The initial setting is @samp{(WL:No Subject in original.)}.  A string
 which is displayed when there's no @samp{Subject:} field in the message.
 
-@item wl-summary-width
-@vindex  wl-summary-width
-The initial setting is 80.
-Width of summary line. If @code{nil}, summary line's width is as is.
-
 @item wl-summary-use-frame
 @vindex wl-summary-use-frame
 The initial setting is @code{nil}.
@@ -3583,11 +3567,34 @@ The initial setting is @code{t}.  If non-nil, last executed @kbd{p},
 @kbd{P}, @kbd{n}, @kbd{N} toggles the direction of cursor move.  If you
 want to aware of reading direction, set this to @code{t}.
 
-@item wl-from-width
-@vindex wl-from-width
+@item wl-summary-width
+@vindex  wl-summary-width
+The initial setting is 80.
+Width of summary line. If @code{nil}, summary line's width is as is.
+
+@item wl-summary-from-width
+@vindex wl-summary-from-width
 The initial setting is 17.
 Width of sender part of summary line.
 
+@item wl-summary-subject-length-limit
+@vindex wl-summary-subject-length-limit
+The initial setting is @code{nil}. Specify the limit for the length of
+subject parts in summary. @code{nil} means unlimited.
+
+@item wl-summary-indent-length-limit
+@vindex  wl-summary-indent-length-limit
+The initial setting is 46.
+Specify the limit of thread indent level. @code{nil} means unlimited
+indent level.
+If you set this to @code{nil} you should set @code{wl-summary-width}
+to @code{nil}, too.
+
+@item wl-summary-recenter
+@vindex  wl-summary-recenter
+The initial setting is t.
+If non-nil, cursor point is moved to the center of the summary window.
+
 @item wl-summary-divide-thread-when-subject-changed
 @vindex wl-summary-divide-thread-when-subject-changed
 The initial setting is @code{nil}.  If non-nil, thread is split if
index 8603cb0..0aa8be4 100644 (file)
 ;; Open new frame for draft buffer.
 ;(setq wl-draft-use-frame t)
 
+;; Don't limit indent for thread view
+;(setq wl-summary-indent-length-limit nil)
+;(setq wl-summary-width nil)
+
 ;; Divide thread by change of subject.
 ;(setq wl-summary-divide-thread-when-subject-changed t)
 
-;; Thread view
+;; Change format of thread view
 ;(setq wl-thread-indent-level 2)
 ;(setq wl-thread-have-younger-brother-str "+"
 ;      wl-thread-youngest-child-str     "+"
index 57fc7a6..6b86faa 100644 (file)
 ;; \e$B%I%i%U%H$r?7$7$$%U%l!<%`$G=q$/\e(B
 ;(setq wl-draft-use-frame t)
 
+;; \e$B%9%l%C%II=<($N%$%s%G%s%H$rL5@)8B$K$9$k!#\e(B
+;(setq wl-summary-indent-length-limit nil)
+;(setq wl-summary-width nil)
+
 ;; \e$B%5%V%8%'%/%H$,JQ$o$C$?$i%9%l%C%I$r@Z$C$FI=<(\e(B
 ;(setq wl-summary-divide-thread-when-subject-changed t)
 
index 40e3617..9252d1b 100644 (file)
@@ -1,3 +1,19 @@
+2001-12-07  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-vars.el (wl-summary-from-width): Rename from wl-from-width.
+       (wl-summary-subject-length-limit): Rename from wl-subject-length-limit.
+       Change default value to nil.
+       (wl-summary-indent-length-limit): The value can be nil, nil means
+       unlimited.
+
+       * wl-summary.el: Don't set limit for indent length if the value of
+       wl-summary-indent-length-limit is nil.
+       If the value of wl-summary-width is nil, it means only that the width
+       of summary is unlimited (nil doesn't mean that the indent length is
+       unlimited).
+
+       * wl-thread.el: Ditto.
+
 2001-12-06  Hiroshi Tsutsui  <tsutsui@easter.kuee.kyoto-u.ac.jp>
 
        * wl-vars.el (wl-summary-update-confirm-threshold): The value can
index 01d62f9..9ff6b20 100644 (file)
@@ -1288,7 +1288,7 @@ If ARG is non-nil, checking is omitted."
                             "[ "
                             (save-match-data
                               (wl-set-string-width
-                               wl-from-width
+                               wl-summary-from-width
                                (wl-summary-from-func-internal
                                 (eword-decode-string
                                  (elmo-delete-char
@@ -4218,8 +4218,7 @@ If ARG, exit virtual folder."
       (setq linked (wl-thread-entity-get-linked thr-entity)))
     (if (string= thr-str "")
        (setq no-parent t)) ; no parent
-    (if (and wl-summary-width
-            wl-summary-indent-length-limit
+    (if (and wl-summary-indent-length-limit
             (< wl-summary-indent-length-limit
                (string-width thr-str)))
        (setq thr-str (wl-set-string-width
@@ -4228,8 +4227,8 @@ If ARG, exit virtual folder."
     (setq from
          (wl-set-string-width
           (if children-num
-              (- wl-from-width (length children-num) 2)
-            wl-from-width)
+              (- wl-summary-from-width (length children-num) 2)
+            wl-summary-from-width)
           (elmo-delete-char ?\n
                             (wl-summary-from-func-internal
                              (elmo-msgdb-overview-entity-get-from entity)))))
@@ -4271,8 +4270,8 @@ If ARG, exit virtual folder."
                                         subject parent-subject)))
                               (wl-summary-subject-func-internal subject) ""))
                     (if (and (not wl-summary-width)
-                             wl-subject-length-limit)
-                        (truncate-string subject wl-subject-length-limit)
+                             wl-summary-subject-length-limit)
+                        (truncate-string subject wl-summary-subject-length-limit)
                       subject)))))
     (if wl-summary-width (setq line
                               (wl-set-string-width
@@ -5234,7 +5233,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
          (setq wl-summary-buffer-current-msg num)
          (when wl-summary-recenter
            (recenter (/ (- (window-height) 2) 2))
-           (if (not wl-summary-width)
+           (if (not wl-summary-indent-length-limit)
                (wl-horizontal-recenter)))
          (wl-highlight-summary-displaying)
          (wl-message-buffer-prefetch-next folder num (current-buffer)
@@ -5260,7 +5259,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
          (setq wl-summary-buffer-current-msg num)
          (when wl-summary-recenter
            (recenter (/ (- (window-height) 2) 2))
-           (if (not wl-summary-width)
+           (if (not wl-summary-indent-length-limit)
                (wl-horizontal-recenter)))
          (wl-highlight-summary-displaying)
          (run-hooks 'wl-summary-redisplay-hook))
@@ -5287,7 +5286,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
          (setq wl-summary-buffer-current-msg num)
          (when wl-summary-recenter
            (recenter (/ (- (window-height) 2) 2))
-           (if (not wl-summary-width)
+           (if (not wl-summary-indent-length-limit)
                (wl-horizontal-recenter)))
          (wl-highlight-summary-displaying)
          (run-hooks 'wl-summary-redisplay-hook))
index 26f4eab..e31050f 100644 (file)
@@ -751,12 +751,12 @@ Message is inserted to the summary buffer."
        (goto-char (match-end 0))
        (setq beg (current-column))
        (setq from-end (save-excursion
-                        (move-to-column (+ 1 beg wl-from-width))
+                        (move-to-column (+ 1 beg wl-summary-from-width))
                         (point)))
        (setq from (buffer-substring (match-end 0) from-end))
        (delete-region (match-end 0) from-end)
        (setq str (wl-set-string-width
-                  (1+ wl-from-width)
+                  (1+ wl-summary-from-width)
                   (format
                    "+%s:%s"
                    (wl-thread-entity-get-children-num
@@ -1213,8 +1213,7 @@ Message is inserted to the summary buffer."
        (setq thr-str
              (wl-thread-make-indent-string
               (wl-thread-get-entity (string-to-int (wl-match-buffer 1)))))
-       (if (and wl-summary-width
-                wl-summary-indent-length-limit
+       (if (and wl-summary-indent-length-limit
                 (< wl-summary-indent-length-limit
                    (string-width thr-str)))
            (setq thr-str (wl-set-string-width
index f6bf3cd..2bb0f4e 100644 (file)
@@ -1327,8 +1327,9 @@ with wl-highlight-folder-many-face."
   :group 'wl-pref)
 
 (defcustom wl-summary-indent-length-limit 46
-  "*Limit of indent length for thread."
-  :type 'integer
+  "*Limit of indent length for thread. Nil means unlimited"
+  :type '(choice (const :tag "Unlimited" nil)
+                integer)
   :group 'wl-summary
   :group 'wl-pref)
 
@@ -1368,13 +1369,13 @@ with wl-highlight-folder-many-face."
                (string :tag "Other"))
   :group 'wl-summary)
 
-(defcustom wl-from-width 17
+(defcustom wl-summary-from-width 17
   "*From width in summary."
   :type 'integer
   :group 'wl-summary
   :group 'wl-pref)
 
-(defcustom wl-subject-length-limit 35
+(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)