* wl/wl-vars.el:

New variable (wl-message-truncate-lines, wl-draft-truncate-lines).

* wl/wl-message.el, wl/wl-draft.el:
Use it to set truncate-lines.

* samples/en/dot.wl, samples/ja/dot.wl
Add truncation settings.

* doc/wl-ja.texi, doc/wl.texi: Update.
NOTE: We should reconsider the place of wl-{folder|summary}-use-frame
in info.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 599b37c..aa65b5b 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -3652,6 +3652,10 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 '("Return-Path" "Received" "^To" "^Cc" "Newsgroups" "Subject" "^From")\e$B!#\e(B
 \e$B%a%C%;!<%8%P%C%U%!$KI=<($9$k%X%C%@%U%#!<%k%I$N=gHV$r@55,I=8=$N%j%9%H$G\e(B
 \e$B;XDj$7$^$9!#\e(B
+@item wl-message-truncate-lines
+@vindex wl-message-truncate-lines
+\e$B=i4|@_Dj$O\e(B @code{default-truncate-lines} \e$B$NCM$,;H$o$l$^$9!#\e(B
+Non-nil \e$B$J$i%a%C%;!<%8%P%C%U%!$GD9$$9T$N@^$jJV$7$r$7$^$;$s!#\e(B
 @end table
 
 
@@ -4151,6 +4155,11 @@ Non-nil \e$B$J$i%U%)%k%@0lMwMQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 Non-nil \e$B$J$i%5%^%jI=<(MQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
 
+@item wl-draft-truncate-lines
+@vindex wl-draft-truncate-lines
+\e$B=i4|@_Dj$O\e(B @code{default-truncate-lines} \e$B$NCM$,;H$o$l$^$9!#\e(B
+Non-nil \e$B$J$i%I%i%U%H%P%C%U%!$GD9$$9T$N@^$jJV$7$r$7$^$;$s!#\e(B
+
 @item wl-from
 @vindex wl-from
 \e$B=i4|@_Dj$OJQ?t\e(B @code{user-mail-address} \e$B$NCM!#\e(B

diff --git a/doc/wl.texi b/doc/wl.texi
index fb230f4..9129823 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -3666,6 +3666,10 @@ If nil, the value of mime-view-visible-field-list is used.
 '("Return-Path" "Received" "^To" "^Cc" "Newsgroups" "Subject" "^From").
 Header fields in message buffer are orderd by this value.
 Each elements are regexp of field-name.
+@item wl-message-truncate-lines
+@vindex wl-message-truncate-lines
+The initial value is the value of @code{default-truncate-lines}.
+If it is non-nil, truncate long lines in message buffer.
 @end table
 
 @node Draft, Disconnected Operations, Message, Top
@@ -4178,6 +4182,21 @@ a reply draft buffer when it is prepared.
 The initial setting is @code{nil}.
 If non-nil, use new frame for the draft.
 
+@item wl-folder-use-frame
+@vindex wl-folder-use-frame
+The initial setting is @code{nil}.
+If non-nil, use new frame for the folder window.
+
+@item wl-summary-use-frame
+@vindex wl-summary-use-frame
+The initial setting is @code{nil}.
+If non-nil, use new frame for the summary.
+
+@item wl-draft-truncate-lines
+@vindex wl-draft-truncate-lines
+The initial value is the value of @code{default-truncate-lines}.
+If it is non-nil, truncate long lines in draft buffer.
+
 @item wl-from
 @vindex wl-from
 The initial setting is the value of the variable

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index bb3923f..791b124 100644 (file)
--- a/samples/en/dot.wl
+++ b/samples/en/dot.wl
@@ -87,6 +87,10 @@
 ;; Keep folder window beside summary. (3 pane)
 ;(setq wl-stay-folder-window t)
 
+;; Truncate long lines.
+;(setq wl-message-truncate-lines t)
+;(setq wl-draft-truncate-lines t)
+
 ;; Open new frame for draft buffer.
 ;(setq wl-draft-use-frame t)
 

diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl
index 5c97f64..54f2d73 100644 (file)
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -87,6 +87,10 @@
 ;; \e$B%5%^%j%P%C%U%!$N:8$K%U%)%k%@%P%C%U%!$rI=<($9$k\e(B (3\e$B%Z%$%sI=<(\e(B)
 ;(setq wl-stay-folder-window t)
 
+;; \e$BD9$$9T$r@Z$j=L$a$k\e(B
+;(setq wl-message-truncate-lines t)
+;(setq wl-draft-truncate-lines t)
+
 ;; \e$B%I%i%U%H$r?7$7$$%U%l!<%`$G=q$/\e(B
 ;(setq wl-draft-use-frame t)
 

diff --git a/wl/ChangeLog b/wl/ChangeLog
index a96d923..276dd2c 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2001-09-26  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-vars.el (wl-message-truncate-lines): New variable.
+       (wl-draft-truncate-lines): Ditto.
+
+       * wl-message.el (wl-mmelmo-message-redisplay): Use it to
+       set truncate-lines.
+
+       * wl-draft.el (wl-draft): Ditto.
+
 2001-09-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-draft.el (wl-draft-yank-from-mail-reply-buffer): Push mark

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 7aaf45e..d614ad7 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1320,6 +1320,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
        (delete-other-windows))
     (auto-save-mode -1)
     (wl-draft-mode)
+    (setq truncate-lines wl-draft-truncate-lines)
     (setq wl-sent-message-via nil)
     (if (stringp (or from wl-from))
        (insert "From: " (or from wl-from) "\n"))

diff --git a/wl/wl-message.el b/wl/wl-message.el
index 0d36a10..8b888b0 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -414,6 +414,7 @@
     (require 'mmelmo)
     (wl-select-buffer view-message-buffer)
     (set-buffer view-message-buffer)
+    (setq truncate-lines wl-message-truncate-lines)
     (unwind-protect
        (progn
          (setq wl-message-buffer-cur-summary-buffer cur-buf)

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 8fd06fe..85b895d 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1127,6 +1127,17 @@ Set this if (system-name) does not return FQDN."
   :type 'boolean
   :group 'wl-pref)
 
+(defcustom wl-message-truncate-lines default-truncate-lines
+  "*Truncate lines in Message Buffer."
+  :type 'boolean
+  :group 'wl-pref)
+
+(defcustom wl-draft-truncate-lines default-truncate-lines
+  "*Truncate lines in Draft Buffer."
+  :type 'boolean
+  :group 'wl-draft
+  :group 'wl-pref)
+
 (defcustom wl-message-scroll-amount 5
   "*Scroll amount by SPC key."
   :type 'integer