From: teranisi <teranisi>
Date: Tue, 9 May 2000 08:29:03 +0000 (+0000)
Subject: * wl-summary.el (wl-summary-reply): Cause an error when there's no
X-Git-Tag: wl-1_1_1~14
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c0256a466610a13e5b677fe64579db1a2678ff89;p=elisp%2Fwanderlust.git

* wl-summary.el (wl-summary-reply): Cause an error when there's no
 message at cursor point.
 (wl-summary-reply-with-citation): Remove unwind-protect.

* wl-summary.el (wl-summary-insert-thread-entity): Eliminated
 subject searching feature.
* wl-vars.el (wl-summary-search-parent-by-subject-regexp):
 Eliminated.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index b94246c..f5c74c1 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,14 @@
+2000-05-09  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-summary.el (wl-summary-reply): Cause an error when there's no
+	message at cursor point.
+	(wl-summary-reply-with-citation): Remove unwind-protect.
+
+	* wl-summary.el (wl-summary-insert-thread-entity): Eliminated
+	subject searching feature.
+	* wl-vars.el (wl-summary-search-parent-by-subject-regexp):
+	Eliminated.
+
 2000-04-28  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-vars.el (wl-summary-search-parent-by-subject-regexp):
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index e0ea03d..716d117 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4,7 +4,7 @@
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
 ;; Keywords: mail, net news
-;; Time-stamp: <00/04/28 16:11:38 teranisi>
+;; Time-stamp: <2000-05-09 17:20:12 teranisi>
 
 ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen).
 
@@ -2874,25 +2874,26 @@ If optional argument is non-nil, checking is omitted."
 	  (elmo-msgdb-overview-get-parent-entity entity overview));; temp
 	 ;;(parent-id (elmo-msgdb-overview-entity-get-id parent-entity))
 	 (parent-number (elmo-msgdb-overview-entity-get-number parent-entity))
-	 (case-fold-search t)
-	 msg overview2 cur-entity)
+	 ;;(case-fold-search t)
+	 ;;overview2 cur-entity
+	 msg) 
     ;; Search parent by subject.
-    (when (and (null parent-number)
-	       (string-match wl-summary-search-parent-by-subject-regexp
-			     (elmo-msgdb-overview-entity-get-subject
-			      entity)))
-      (setq overview2 overview)
-      (while overview2
-	(setq cur-entity (car overview2))
-	(when (wl-summary-subject-equal
-	       (or (elmo-msgdb-overview-entity-get-subject cur-entity)
-		   "")
-	       (or (elmo-msgdb-overview-entity-get-subject entity)
-		   ""))
-	  (setq parent-number (elmo-msgdb-overview-entity-get-number
-			       cur-entity))
-	  (setq overview2 nil))
-	(setq overview2 (cdr overview2))))
+;     (when (and (null parent-number)
+; 	       (string-match wl-summary-search-parent-by-subject-regexp
+; 			     (elmo-msgdb-overview-entity-get-subject
+; 			      entity)))
+;       (setq overview2 overview)
+;       (while overview2
+; 	(setq cur-entity (car overview2))
+; 	(when (wl-summary-subject-equal
+; 	       (or (elmo-msgdb-overview-entity-get-subject cur-entity)
+; 		   "")
+; 	       (or (elmo-msgdb-overview-entity-get-subject entity)
+; 		   ""))
+; 	  (setq parent-number (elmo-msgdb-overview-entity-get-number
+; 			       cur-entity))
+; 	  (setq overview2 nil))
+; 	(setq overview2 (cdr overview2))))
     (if (and parent-number
 	     wl-summary-divide-thread-when-subject-changed
 	     (not (wl-summary-subject-equal 
@@ -4821,11 +4822,12 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 
 (defun wl-summary-reply-with-citation (&optional arg)
   (interactive "P")
-  (unwind-protect
-      (wl-summary-reply arg t)
-    (goto-char (point-max))
-    (wl-draft-yank-original)
-    (run-hooks 'wl-mail-setup-hook)))
+  ;; Is unwind-protect needed?
+  ;(unwind-protect
+  (wl-summary-reply arg t)
+  (goto-char (point-max))
+  (wl-draft-yank-original)
+  (run-hooks 'wl-mail-setup-hook));)
 
 (defun wl-summary-jump-to-msg-by-message-id (&optional id)
   (interactive)
@@ -4989,6 +4991,7 @@ Reply to author if invoked with argument."
 	(number (wl-summary-message-number))
 	(summary-buf (current-buffer))
 	mes-buf)
+    (unless number (error "No message"))
     (wl-summary-redisplay-internal folder number)
     (wl-select-buffer (get-buffer (setq mes-buf (wl-current-message-buffer))))
     (set-buffer mes-buf)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 6159d8a..600eb88 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -4,7 +4,7 @@
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
 ;; Keywords: mail, net news
-;; Time-stamp: <2000-04-28 16:56:38 teranisi>
+;; Time-stamp: <2000-05-09 17:19:31 teranisi>
 
 ;; This file is part of Wanderlust (Yet Another Message Interface on Emacsen).
 
@@ -175,11 +175,11 @@ If you don't have multiple e-mail addresses, you don't have to set this."
   :type 'function
   :group 'wl-summary)
 
-(defcustom wl-summary-search-parent-by-subject-regexp "^[ \t]*\\(\\[[^:]+[,: ][0-9]+\\]\\)?[ \t]*re"
-  "*If message does not have in-reply-to field nor references field and
-subject matches this regexp, search parent message by subject matching."
-  :type 'string
-  :group 'wl-summary)
+;(defcustom wl-summary-search-parent-by-subject-regexp "^[ \t]*\\(\\[[^:]+[,: ][0-9]+\\]\\)?[ \t]*re"
+;   "*If message does not have in-reply-to field nor references field and
+; subject matches this regexp, search parent message by subject matching."
+;   :type 'string
+;   :group 'wl-summary)
 
 (defcustom wl-summary-update-confirm-threshold 500
   "*Confirm updating summary if message number is larger than this value."