X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-thread.el;h=5e5bca3af242fbf28c177567f81b44d35709079f;hb=9ddac14c0b5daa5f6226bb422c36d16b2ccac5e9;hp=51cc6843962ff26a7110f43568ef71295545e352;hpb=ee2c7162e3f8dade1f2e855b1080f99f5f0c5070;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-thread.el b/wl/wl-thread.el
index 51cc684..5e5bca3 100644
--- a/wl/wl-thread.el
+++ b/wl/wl-thread.el
@@ -41,13 +41,10 @@
 (defvar wl-thread-entities nil)
 (defvar wl-thread-entity-list nil)	; entity list
 (defvar wl-thread-entity-hashtb nil)	; obarray
-(defvar wl-thread-indent-regexp nil)
 
 (make-variable-buffer-local 'wl-thread-entity-hashtb)
 (make-variable-buffer-local 'wl-thread-entities)     ; ".wl-thread-entity"
 (make-variable-buffer-local 'wl-thread-entity-list)  ; ".wl-thread-entity-list"
-(make-variable-buffer-local 'wl-thread-entity-cur)
-(make-variable-buffer-local 'wl-thread-indent-regexp)
 
 ;;; global flag
 (defvar wl-thread-insert-force-opened nil)
@@ -262,20 +259,15 @@
   "If parent of ENTITY is invisible, the top invisible ancestor entity of
 ENTITY is returned."
   (let ((cur-entity entity)
-	ret-val)
+	top)
     (catch 'done
       (while (setq cur-entity (wl-thread-entity-get-parent-entity
 			       cur-entity))
 	(if (null (wl-thread-entity-get-number cur-entity))
-	    ;; top!!
-	    (progn
-	      ;;(setq ret-val nil)
-	      (throw 'done nil))
+	    (throw 'done nil)
 	  (when (not (wl-thread-entity-get-opened cur-entity))
-	    ;; not opened!!
-	    (setq ret-val cur-entity)))))
-    ;; top of closed entity in the path.
-    ret-val))
+	    (setq top cur-entity)))))
+    top))
 
 (defun wl-thread-entity-get-nearly-older-brother (entity &optional parent)
   (let ((brothers (wl-thread-entity-get-older-brothers entity parent)))
@@ -684,10 +676,9 @@ Message is inserted to the summary buffer."
 		parent-msg (wl-summary-buffer-msgdb)))
 	      (when parent
 		;; use thread structure.
-		(wl-thread-entity-get-nearly-older-brother
-		 child-entity parent))) ; return value
-;;; 		(wl-thread-entity-get-number
-;;; 		 (wl-thread-entity-get-top-entity parent)))) ; return value;
+		;;(wl-thread-entity-get-nearly-older-brother
+		;; child-entity parent))) ; return value
+ 		(wl-thread-entity-get-number parent))) ; return value
 ;;; 	      (setq beg (point))
 ;;; 	      (wl-thread-goto-bottom-of-sub-thread)
 ;;; 	      (wl-thread-update-indent-string-region beg (point)))
@@ -1087,6 +1078,8 @@ Message is inserted to the summary buffer."
 	      (wl-summary-jump-to-msg msg)
 	      (wl-thread-close
 	       (wl-thread-get-entity (wl-summary-message-number)))))))
+      (when wl-summary-lazy-highlight
+	(wl-highlight-summary-window))
       (wl-summary-set-message-modified)
       (set-buffer-modified-p nil))))
 
@@ -1104,8 +1097,8 @@ Message is inserted to the summary buffer."
   (save-excursion
     (goto-char beg)
     (while (< (point) end)
-      ;(wl-thread-update-indent-string)
-      (wl-thread-update-line-on-buffer)
+      (save-excursion
+	(wl-thread-update-line-on-buffer-sub nil (wl-summary-message-number)))
       (forward-line 1))))
 
 (defsubst wl-thread-make-indent-string (entity)