(car (last brothers)))))
(defun wl-thread-entity-get-older-brothers (entity &optional parent)
- (let* ((parent (or parent
- (wl-thread-entity-get-parent-entity entity)))
- (brothers (wl-thread-entity-get-children parent))
- ret-val)
+ (let ((parent (or parent
+ (wl-thread-entity-get-parent-entity entity)))
+ brothers ret-val)
(if parent
- brothers
+ (setq brothers (wl-thread-entity-get-children parent))
(setq brothers wl-thread-entity-list))
(while (and brothers
(not (eq (wl-thread-entity-get-number entity)
(when (setq message-entity
(elmo-message-entity wl-summary-buffer-elmo-folder
msg))
- (wl-summary-insert-line
+ (wl-summary-insert-line
(wl-summary-create-line
message-entity
(elmo-message-entity wl-summary-buffer-elmo-folder
parent-msg)
temp-mark
- (elmo-message-mark wl-summary-buffer-elmo-folder msg)
+ (elmo-message-flags wl-summary-buffer-elmo-folder
+ msg)
+ (elmo-message-cached-p wl-summary-buffer-elmo-folder
+ msg)
(if wl-thread-insert-force-opened
nil
(wl-thread-maybe-get-children-num msg))
(defun wl-thread-delete-message (msg &optional deep update)
"Delete MSG from entity and buffer."
(save-excursion
- (let* ((entity (wl-thread-get-entity msg))
- children older-brothers younger-brothers top-child ;;grandchildren
- top-entity parent update-msgs beg invisible-top)
+ (let ((entity (wl-thread-get-entity msg))
+ top-child top-entity update-msgs invisible-top)
(setq wl-summary-buffer-number-list
- (delq msg wl-summary-buffer-number-list))
+ (delq msg wl-summary-buffer-number-list))
(when entity
- (setq parent (wl-thread-entity-get-parent-entity entity))
- (if parent
- (progn
-;;; has parent.
-;;; (setq brothers (wl-thread-entity-get-children parent))
- (setq older-brothers (wl-thread-entity-get-older-brothers
- entity parent))
- (setq younger-brothers (wl-thread-entity-get-younger-brothers
- entity parent))
- ;;
- (unless deep
- (setq children (wl-thread-entity-get-children entity))
- (wl-thread-reparent-children
- children (wl-thread-entity-get-number parent))
- (setq update-msgs
- (apply (function nconc)
- update-msgs
- (mapcar
- (function
- (lambda (message)
- (wl-thread-get-children-msgs message t)))
- children))))
- (wl-thread-entity-set-children
- parent (append older-brothers children younger-brothers))
- ;; If chidren and younger-brothers not exists,
- ;; update nearly older brother.
- (when (and older-brothers
- (not younger-brothers)
- (not children))
- (wl-append
- update-msgs
- (wl-thread-get-children-msgs (car (last older-brothers))))))
-
- ;; top...oldest child becomes top.
- (unless deep
- (setq children (wl-thread-entity-get-children entity))
- (when children
- (setq top-child (car children)
- children (cdr children))
- (setq top-entity (wl-thread-get-entity top-child))
- (wl-thread-entity-set-parent top-entity nil)
- (wl-thread-entity-set-linked top-entity nil)
- (wl-append update-msgs
- (wl-thread-get-children-msgs top-child t)))
- (when children
- (wl-thread-entity-set-children
- top-entity
- (append
- (wl-thread-entity-get-children top-entity)
- children))
- (wl-thread-reparent-children children top-child)
- (wl-append update-msgs children)))
- ;; delete myself from top list.
- (setq older-brothers (wl-thread-entity-get-older-brothers
- entity nil))
- (setq younger-brothers (wl-thread-entity-get-younger-brothers
- entity nil))
- (setq wl-thread-entity-list
- (append (append older-brothers
- (and top-child (list top-child)))
- younger-brothers))))
-
+ (let ((parent (wl-thread-entity-get-parent-entity entity)))
+ (if parent
+ ;; has parent.
+ (let (children
+ (older-brothers (wl-thread-entity-get-older-brothers
+ entity parent))
+ (younger-brothers (wl-thread-entity-get-younger-brothers
+ entity parent)))
+ (unless deep
+ (setq children (wl-thread-entity-get-children entity))
+ (wl-thread-reparent-children
+ children (wl-thread-entity-get-number parent))
+ (setq update-msgs
+ (apply (function nconc)
+ update-msgs
+ (mapcar
+ (function
+ (lambda (message)
+ (wl-thread-get-children-msgs message t)))
+ children))))
+ (wl-thread-entity-set-children
+ parent (append older-brothers children younger-brothers))
+ ;; If chidren and younger-brothers do not exist,
+ ;; update nearly older brother.
+ (when (and older-brothers
+ (not younger-brothers)
+ (not children))
+ (wl-append
+ update-msgs
+ (wl-thread-get-children-msgs (car (last older-brothers))))))
+ ;; top...oldest child becomes top.
+ (unless deep
+ (let ((children (wl-thread-entity-get-children entity)))
+ (when children
+ (setq top-child (car children)
+ children (cdr children))
+ (setq top-entity (wl-thread-get-entity top-child))
+ (wl-thread-entity-set-parent top-entity nil)
+ (wl-thread-entity-set-linked top-entity nil)
+ (wl-append update-msgs
+ (wl-thread-get-children-msgs top-child t)))
+ (when children
+ (wl-thread-entity-set-children
+ top-entity
+ (append
+ (wl-thread-entity-get-children top-entity)
+ children))
+ (wl-thread-reparent-children children top-child)
+ (wl-append update-msgs children))))
+ ;; delete myself from top list.
+ (let ((match (memq msg wl-thread-entity-list)))
+ (when match
+ (if top-child
+ (setcar match top-child)
+ (setq wl-thread-entity-list
+ (delq msg wl-thread-entity-list))))))))
+ ;;
(if deep
;; delete thread on buffer
(when (wl-summary-jump-to-msg msg)
- (setq beg (point))
- (wl-thread-goto-bottom-of-sub-thread)
- (delete-region beg (point)))
+ (let ((beg (point)))
+ (wl-thread-goto-bottom-of-sub-thread)
+ (delete-region beg (point))))
;; delete myself from buffer.
(unless (wl-thread-delete-line-from-buffer msg)
;; jump to suitable point.
;; insert children if thread is closed or delete top.
(when (or top-child
(not (wl-thread-entity-get-opened entity)))
- (let* (next-top insert-msgs ent e grandchildren)
+ (let (next-top insert-msgs ent grandchildren)
(if top-child
(progn
(setq insert-msgs (wl-thread-get-exist-children
;; don't update buffer
update-msgs)))) ; return value
-(defun wl-thread-insert-message (overview-entity
+(defun wl-thread-insert-message (message-entity
msg parent-msg &optional update linked)
"Insert MSG to the entity.
When optional argument UPDATE is non-nil,
Message is inserted to the summary buffer."
(let ((parent (wl-thread-get-entity parent-msg))
- (depth 0) cur
child-entity invisible-top)
;;; Update the thread view...not implemented yet.
;;; (when force-insert
;;; (if parent
;;; (wl-thread-entity-force-open parent))
(when (and wl-summary-max-thread-depth parent)
- (setq cur parent)
- (while cur
- (incf depth)
- (setq cur (wl-thread-entity-get-parent-entity cur)))
- (when (> depth wl-summary-max-thread-depth)
- (setq parent nil)))
+ (let ((cur parent)
+ (depth 0))
+ (while cur
+ (incf depth)
+ (setq cur (wl-thread-entity-get-parent-entity cur)))
+ (when (> depth wl-summary-max-thread-depth)
+ (setq parent nil
+ parent-msg nil))))
(if parent
;; insert as children.
(wl-thread-entity-insert-as-children
;; visible.
(progn
(wl-summary-update-thread
- overview-entity
+ message-entity
child-entity
(elmo-message-entity wl-summary-buffer-elmo-folder
parent-msg))
(wl-thread-update-children-number invisible-top)
nil))))
+;(defun wl-thread-get-parent-list (msgs)
+; ;; return ancestors
+; (let* ((msgs2 msgs)
+; myself)
+; (while msgs2
+; (setq myself (car msgs2)
+; msgs2 (cdr msgs2))
+; (while (not (eq myself (car msgs2)))
+; (if (wl-thread-descendant-p myself (car msgs2))
+; (setq msgs (delq (car msgs2) msgs)))
+; (setq msgs2 (or (cdr msgs2) msgs)))
+; (setq msgs2 (cdr msgs2)))
+; msgs))
+
(defun wl-thread-get-parent-list (msgs)
- (let* ((msgs2 msgs)
- myself)
- (while msgs2
- (setq myself (car msgs2)
- msgs2 (cdr msgs2))
- (while (not (eq myself (car msgs2)))
- (if (wl-thread-descendant-p myself (car msgs2))
- (setq msgs (delq (car msgs2) msgs)))
- (setq msgs2 (or (cdr msgs2) msgs)))
- (setq msgs2 (cdr msgs2)))
- msgs))
+ ;; return connected ancestors
+ (let ((ptr msgs)
+ parent ret)
+ (while (car ptr)
+ (setq parent (wl-thread-entity-get-parent (wl-thread-get-entity (car ptr))))
+ (when (or (not parent)
+ (not (memq parent msgs)))
+ (setq ret (append ret (list (car ptr)))))
+ (setq ptr (cdr ptr)))
+ ret))
(defun wl-thread-update-indent-string-thread (top-list)
- (let ((top-list (wl-thread-get-parent-list top-list))
- beg)
+ (let* ((top-list (wl-thread-get-parent-list top-list))
+ (num (length top-list))
+ (i 0)
+ beg)
(while top-list
+ (when (> num elmo-display-progress-threshold)
+ (setq i (1+ i))
+ (when (or (zerop (% i 5)) (= i num))
+ (elmo-display-progress
+ 'wl-thread-update-indent-string-thread
+ "Updating thread indent..."
+ (/ (* i 100) num))))
(when (car top-list)
(wl-summary-jump-to-msg (car top-list))
(setq beg (point))
(wl-thread-goto-bottom-of-sub-thread)
(wl-thread-update-indent-string-region beg (point)))
- (setq top-list (cdr top-list)))))
+ (setq top-list (cdr top-list)))
+ (message "Updating thread indent...done")))
(defun wl-thread-update-children-number (entity)
"Update the children number."
(interactive "P")
(wl-thread-call-region-func 'wl-summary-mark-as-important-region arg))
+(defun wl-thread-set-flags (&optional arg)
+ (interactive "P")
+ (wl-thread-call-region-func 'wl-summary-set-flags-region arg))
+
+(defun wl-thread-mark-as-answered (&optional arg)
+ (interactive "P")
+ (wl-thread-call-region-func 'wl-summary-mark-as-answered-region arg))
+
(defun wl-thread-unmark (&optional arg)
(interactive "P")
(wl-thread-call-region-func 'wl-summary-unmark-region arg))
(elmo-message-entity wl-summary-buffer-elmo-folder
(nth 0 parent-entity))
temp-mark
- (elmo-message-mark wl-summary-buffer-elmo-folder msg-num)
+ (elmo-message-flags wl-summary-buffer-elmo-folder
+ msg-num)
+ (elmo-message-cached-p wl-summary-buffer-elmo-folder
+ msg-num)
(if wl-thread-insert-force-opened
nil
(wl-thread-maybe-get-children-num msg-num))
(while children-msgs
(if (and (not (eq msg (car children-msgs))) ; except itself
(or (and uncached-marks
- (setq mark (elmo-message-mark
+ (setq mark (wl-summary-message-mark
wl-summary-buffer-elmo-folder
(car children-msgs)))
(member mark uncached-marks))
(incf depth)
(setq entity (wl-thread-get-entity number)))
depth))
-
+
(defun wl-thread-update-indent-string-region (beg end)
(interactive "r")
(save-excursion
(wl-thread-entity-set-children
dst-parent-entity
(append children (list number)))
- (wl-thread-entity-set-linked entity t))
+ (wl-thread-entity-set-linked
+ entity
+ (let ((parent (elmo-message-entity-parent
+ wl-summary-buffer-elmo-folder
+ (elmo-message-entity
+ wl-summary-buffer-elmo-folder
+ number))))
+ (or (null parent)
+ (/= parent-number (elmo-message-entity-number parent))))))
;; insert as top
(wl-append wl-thread-entity-list (list number))
(wl-thread-entity-set-linked entity nil))