From da5714ffa6ec444396b0eaed9ddb011ca4b3b4b4 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 21 Dec 2001 00:59:21 +0000
Subject: [PATCH] * wl-ja.texi, wl.texi (wl-draft-elide-region): Added.

* wl-draft.el (wl-draft-elide-region): New user command.
* wl-vars.el (wl-draft-elide-ellipsis): New user option.
* wl-e21.el (wl-draft-key-setup): Bind the key `C-c C-d' to the
command `wl-draft-elide-region'.
* wl-mule.el: Ditto.
* wl-xmas.el: Ditto.
---
 doc/wl-ja.texi |    7 +++++++
 doc/wl.texi    |    8 ++++++++
 wl/ChangeLog   |   10 ++++++++++
 wl/wl-draft.el |    9 +++++++++
 wl/wl-e21.el   |    3 ++-
 wl/wl-mule.el  |    3 ++-
 wl/wl-vars.el  |    5 +++++
 wl/wl-xmas.el  |    3 ++-
 8 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index d21a3cc..d2a8dcb 100644
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -4272,6 +4272,13 @@ Wanderlust のオフラインモード/オンラインモードをトグルします。
 アドレスマネージャを起動します。
 @xref{Address Manager}.
 (@code{wl-addrmgr})
+
+@item C-c C-d
+@kindex C-c C-d (Draft)
+@findex wl-draft-elide-region
+ポイントとマークの間の文を省きます (@code{wl-draft-elide-region})。文章
+は切られて (killed) 変数 @code{wl-draft-elide-ellipsis} の値で置き換えら
+れます。デフォルトの省略符号として使われる値は (@samp{[...]}) です。
 @end table
 
 @section カスタマイズ変数
diff --git a/doc/wl.texi b/doc/wl.texi
index b0a4604..4200f8d 100644
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -4306,6 +4306,14 @@ Selects a template.
 Enter Address Manager.
 @xref{Address Manager}.
 (@code{wl-addrmgr})
+
+@item C-c C-d
+@kindex C-c C-d (Draft)
+@findex wl-draft-elide-region
+Elide the text between point and mark (@code{wl-draft-elide-region}).
+The text is killed and replaced with the contents of the variable
+@code{wl-draft-elide-ellipsis}.  The default value is to use an ellipsis
+(@samp{[...]}).
 @end table
 
 @section Customizable Variables
diff --git a/wl/ChangeLog b/wl/ChangeLog
index cee9696..97d934c 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* wl-draft.el (wl-draft-elide-region): New user command.
+	* wl-vars.el (wl-draft-elide-ellipsis): New user option.
+
+	* wl-e21.el (wl-draft-key-setup): Bind the key `C-c C-d' to the
+	command `wl-draft-elide-region'.
+	* wl-mule.el: Ditto.
+	* wl-xmas.el: Ditto.
+
 2001-12-20  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-util.el (wl-biff-check-folder): Fix for non-pop3 folders.
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index d6d28d7..7477196 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -732,6 +732,15 @@ Reply to author if WITH-ARG is non-nil."
       (mail-position-on-field "to"))
   (insert "\nFcc: "))
 
+;; Imported from message.el.
+(defun wl-draft-elide-region (b e)
+  "Elide the text in the region.
+An ellipsis (from `wl-draft-elide-ellipsis') will be inserted where the
+text was killed."
+  (interactive "r")
+  (kill-region b e)
+  (insert wl-draft-elide-ellipsis))
+
 ;; function for wl-sent-message-via
 
 (defmacro wl-draft-sent-message-p (type)
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 579749c..a9f48e2 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -610,7 +610,8 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message)
   (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr)
   (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
-  (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer))
+  (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer)
+  (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region))
 
 (defun wl-draft-overload-functions ()
   (wl-mode-line-buffer-identification)
diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 065060a..e8540d3 100644
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -158,7 +158,8 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message)
   (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
   (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr)
-  (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer))
+  (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer)
+  (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region))
 
 (defun wl-draft-overload-menubar ()
   (local-set-key [menu-bar mail send]
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 369d324..52f9c6e 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -952,6 +952,11 @@ ex.
   :group 'wl-draft
   :group 'wl-setting)
 
+(defcustom wl-draft-elide-ellipsis "\n[...]\n\n"
+  "*The string which is inserted for elided text."
+  :type 'string
+  :group 'wl-draft)
+
 (defcustom wl-template-alist nil
   "Alist of template."
   :type '(repeat (list (string :tag "Name")
diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index b60ba74..2799c53 100644
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -514,7 +514,8 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message)
   (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
   (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr)
-  (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer))
+  (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer)
+  (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region))
 
 (defun wl-draft-overload-functions ()
   (wl-mode-line-buffer-identification)
-- 
1.7.10.4