From: yoichi <yoichi>
Date: Wed, 26 Sep 2001 08:14:26 +0000 (+0000)
Subject: * wl/wl-vars.el:
X-Git-Tag: wl-2_6_1~21
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd02cae8767dedbb1dfee81b78a39fa7e5fa5325;p=elisp%2Fwanderlust.git

* 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
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -3652,6 +3652,10 @@ nil なら、mime-view-visible-field-list の値が使われます。
 '("Return-Path" "Received" "^To" "^Cc" "Newsgroups" "Subject" "^From")。
 メッセージバッファに表示するヘッダフィールドの順番を正規表現のリストで
 指定します。
+@item wl-message-truncate-lines
+@vindex wl-message-truncate-lines
+初期設定は @code{default-truncate-lines} の値が使われます。
+Non-nil ならメッセージバッファで長い行の折り返しをしません。
 @end table
 
 
@@ -4151,6 +4155,11 @@ Non-nil ならフォルダ一覧用に新しいフレームを開きます。
 初期設定は @code{nil}。
 Non-nil ならサマリ表示用に新しいフレームを開きます。
 
+@item wl-draft-truncate-lines
+@vindex wl-draft-truncate-lines
+初期設定は @code{default-truncate-lines} の値が使われます。
+Non-nil ならドラフトバッファで長い行の折り返しをしません。
+
 @item wl-from
 @vindex wl-from
 初期設定は変数 @code{user-mail-address} の値。
diff --git a/doc/wl.texi b/doc/wl.texi
index fb230f4..9129823 100644
--- 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
--- 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
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -87,6 +87,10 @@
 ;; サマリバッファの左にフォルダバッファを表示する (3ペイン表示)
 ;(setq wl-stay-folder-window t)
 
+;; 長い行を切り縮める
+;(setq wl-message-truncate-lines t)
+;(setq wl-draft-truncate-lines t)
+
 ;; ドラフトを新しいフレームで書く
 ;(setq wl-draft-use-frame t)
 
diff --git a/wl/ChangeLog b/wl/ChangeLog
index a96d923..276dd2c 100644
--- 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
--- 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
--- 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
--- 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