-;;; wl-thread.el -- Thread display modules for Wanderlust.
+;;; wl-thread.el --- Thread display modules for Wanderlust.
;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
;; Copyright (C) 1998,1999,2000 Masahiro MURATA <muse@ba2.so-net.ne.jp>
;;
;;; Commentary:
-;;
+;;
;;; Code:
-;;
+;;
(require 'wl-summary)
(require 'wl-highlight)
;; buffer local variables.
;;(defvar wl-thread-top-entity '(nil t nil nil)) ; top entity
-(defvar wl-thread-tops nil) ; top number list (number)
+(defvar wl-thread-tops nil) ; top number list (number)
(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)
+(defvar wl-thread-entity-list nil) ; entity list
+(defvar wl-thread-entity-hashtb nil) ; obarray
(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)
(let (entities top-list)
(setq entities (wl-summary-load-file-object
(expand-file-name wl-thread-entity-file
- (elmo-msgdb-expand-path fld))))
+ (elmo-folder-msgdb-path fld))))
(setq top-list
(wl-summary-load-file-object
(expand-file-name wl-thread-entity-list-file
- (elmo-msgdb-expand-path fld))))
+ (elmo-folder-msgdb-path fld))))
(message "Resuming thread structure...")
;; set obarray value.
(setq wl-thread-entity-hashtb (elmo-make-hash (* (length entities) 2)))
msgs-stack children)
(while msgs
(setq wl-summary-buffer-number-list (cons (car entity)
- wl-summary-buffer-number-list))
+ wl-summary-buffer-number-list))
(setq msgs (cdr msgs))
(setq children (wl-thread-entity-get-children entity))
(if children
curp curc)
(setq curp to)
(elmo-list-insert wl-summary-buffer-number-list
- (wl-thread-entity-get-number entity)
- (progn
- (while (setq curc
- (wl-thread-entity-get-children curp))
- (setq curp (wl-thread-get-entity
- (nth (- (length curc) 1)
- curc))))
- (wl-thread-entity-get-number curp)))
+ (wl-thread-entity-get-number entity)
+ (progn
+ (while (setq curc
+ (wl-thread-entity-get-children curp))
+ (setq curp (wl-thread-get-entity
+ (nth (- (length curc) 1)
+ curc))))
+ (wl-thread-entity-get-number curp)))
(setcar (cddr to) (wl-append children
(list (car entity))))
(setq wl-thread-entities (cons entity wl-thread-entities))
(defun wl-thread-jump-to-msg (&optional number)
(interactive)
(let ((num (or number
- (string-to-int
- (read-from-minibuffer "Jump to Message(No.): ")))))
+ (string-to-int
+ (read-from-minibuffer "Jump to Message(No.): ")))))
(wl-thread-entity-force-open (wl-thread-get-entity num))
(wl-summary-jump-to-msg num)))
(cur 0)
entity)
(while (not (eobp))
- (unless (wl-thread-entity-get-opened
- (setq entity (wl-thread-get-entity
- (wl-summary-message-number))))
- (wl-thread-entity-force-open entity))
- (wl-thread-goto-bottom-of-sub-thread)
+ (if (wl-thread-entity-get-opened
+ (setq entity (wl-thread-get-entity
+ (wl-summary-message-number))))
+ (forward-line 1)
+ (wl-thread-force-open)
+ (wl-thread-goto-bottom-of-sub-thread))
(when (> len elmo-display-progress-threshold)
(setq cur (1+ cur))
(elmo-display-progress
(defun wl-thread-open-all-unread ()
(interactive)
- (let ((mark-alist (elmo-msgdb-get-mark-alist wl-summary-buffer-msgdb))
- mark)
- (while mark-alist
- (if (setq mark (nth 1 (car mark-alist)))
- (if (or (string= mark wl-summary-unread-uncached-mark)
- (string= mark wl-summary-unread-cached-mark)
- (string= mark wl-summary-new-mark)
- (string= mark wl-summary-important-mark))
- (wl-thread-entity-force-open (wl-thread-get-entity
- (nth 0 (car mark-alist))))))
- (setq mark-alist (cdr mark-alist)))))
+ (dolist (number (elmo-folder-list-messages-mark-match
+ wl-summary-buffer-elmo-folder
+ (wl-regexp-opt (list elmo-msgdb-unread-uncached-mark
+ elmo-msgdb-unread-cached-mark
+ elmo-msgdb-new-mark
+ elmo-msgdb-important-mark))))
+ (wl-thread-entity-force-open (wl-thread-get-entity number))))
(defsubst wl-thread-maybe-get-children-num (msg)
(let ((entity (wl-thread-get-entity msg)))
(defsubst wl-thread-update-line-on-buffer-sub (entity msg &optional parent-msg)
(let* ((entity (or entity (wl-thread-get-entity msg)))
(parent-msg (or parent-msg (wl-thread-entity-get-parent entity)))
- (overview (elmo-msgdb-get-overview wl-summary-buffer-msgdb))
- (mark-alist (elmo-msgdb-get-mark-alist wl-summary-buffer-msgdb))
+ (overview (elmo-msgdb-get-overview (wl-summary-buffer-msgdb)))
(buffer-read-only nil)
(inhibit-read-only t)
overview-entity temp-mark summary-line invisible-top dest-pair)
(t (setq temp-mark (wl-summary-get-score-mark msg))))
(when (setq overview-entity
(elmo-msgdb-overview-get-entity
- msg wl-summary-buffer-msgdb))
- (setq summary-line
- (wl-summary-overview-create-summary-line
- msg
- overview-entity
- (elmo-msgdb-overview-get-entity
- parent-msg wl-summary-buffer-msgdb)
- nil
- mark-alist
- (if wl-thread-insert-force-opened
- nil
- (wl-thread-maybe-get-children-num msg))
- temp-mark entity))
- (save-excursion
- (wl-summary-insert-line summary-line))
+ msg (wl-summary-buffer-msgdb)))
+ (wl-summary-insert-line
+ (wl-summary-create-line
+ overview-entity
+ (elmo-msgdb-overview-get-entity
+ parent-msg (wl-summary-buffer-msgdb))
+ temp-mark
+ (elmo-msgdb-get-mark (wl-summary-buffer-msgdb) msg)
+ (if wl-thread-insert-force-opened
+ nil
+ (wl-thread-maybe-get-children-num msg))
+ (wl-thread-make-indent-string entity)
+ (wl-thread-entity-get-linked entity)))
(if dest-pair
(wl-summary-print-destination (car dest-pair)
(cdr dest-pair)))))
(if (not (setq invisible-top
(wl-thread-entity-parent-invisible-p entity)))
(wl-summary-update-thread
- (elmo-msgdb-overview-get-entity msg wl-summary-buffer-msgdb)
- overview
- mark-alist
+ (elmo-msgdb-overview-get-entity msg (wl-summary-buffer-msgdb))
entity
(and parent-msg
(elmo-msgdb-overview-get-entity
- parent-msg wl-summary-buffer-msgdb)))
+ parent-msg (wl-summary-buffer-msgdb))))
;; currently invisible.. update closed line.
(wl-thread-update-children-number invisible-top)))))
wl-thread-entity-hashtb))
(setq msgs (cdr msgs)))))
-(defun wl-thread-get-exist-children (msg)
+(defun wl-thread-get-exist-children (msg &optional include-self)
(let ((msgs (list msg))
msgs-stack children
entity ret-val)
(while msgs
(setq children (wl-thread-entity-get-children
(setq entity (wl-thread-get-entity (car msgs)))))
- (when (elmo-msgdb-overview-get-entity (car msgs) wl-summary-buffer-msgdb)
+ (when (elmo-msgdb-overview-get-entity (car msgs)
+ (wl-summary-buffer-msgdb))
(wl-append ret-val (list (car msgs)))
(setq children nil))
(setq msgs (cdr msgs))
(setq msgs (wl-pop msgs-stack)))
(wl-push msgs msgs-stack)
(setq msgs children)))
+ (unless include-self (setq ret-val (delq msg ret-val)))
ret-val))
(defun wl-thread-delete-message (msg &optional deep update)
(let* (next-top insert-msgs ent e grandchildren)
(if top-child
(progn
- (setq insert-msgs (wl-thread-get-exist-children top-child))
+ (setq insert-msgs (wl-thread-get-exist-children
+ top-child 'include-self))
(setq next-top (car insert-msgs))
(setq ent (wl-thread-get-entity next-top))
(when (and
ent entity nil))
(setq insert-msgs (cdr insert-msgs))))))
(if update
- ;; modify buffer.
+ ;; modify buffer.
(while update-msgs
(wl-thread-update-line-on-buffer-sub nil (pop update-msgs)))
- ;; don't update buffer
+ ;; don't update buffer
update-msgs)))) ; return value
-(defun wl-thread-insert-message (overview-entity overview mark-alist
+(defun wl-thread-insert-message (overview-entity
msg parent-msg &optional update linked)
"Insert MSG to the entity.
When optional argument UPDATE is non-nil,
;; insert as children.
(wl-thread-entity-insert-as-children
parent
- (setq child-entity (wl-thread-create-entity msg (nth 0 parent) nil linked)))
+ (setq child-entity (wl-thread-create-entity
+ msg (nth 0 parent) nil linked)))
;; insert as top message.
(wl-thread-entity-insert-as-top
(wl-thread-create-entity msg nil)))
(progn
(wl-summary-update-thread
overview-entity
- overview
- mark-alist
child-entity
(elmo-msgdb-overview-get-entity
- parent-msg wl-summary-buffer-msgdb))
+ 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)))
(defun wl-thread-update-children-number (entity)
"Update the children number."
- (save-excursion
- (wl-summary-jump-to-msg (wl-thread-entity-get-number entity))
- (beginning-of-line)
- (let ((text-prop (get-text-property (point) 'face))
- from from-end beg str)
- (cond
- ((looking-at (concat "^" wl-summary-buffer-number-regexp
- "..../..\(.*\)..:.. ["
- wl-thread-indent-regexp
- "]*[[<]\\+\\([0-9]+\\):"))
- (delete-region (match-beginning 1)(match-end 1))
- (goto-char (match-beginning 1))
- (setq str (format "%s" (wl-thread-entity-get-children-num entity)))
- (if wl-summary-highlight
- (put-text-property 0 (length str) 'face text-prop str))
- (insert str))
- ((looking-at (concat "^" wl-summary-buffer-number-regexp
- "..../..\(.*\)..:.. ["
- wl-thread-indent-regexp
- "]*[[<]"))
- (goto-char (match-end 0))
- (setq beg (current-column))
- (setq from-end (save-excursion
- (move-to-column (+ 1 beg wl-from-width))
- (point)))
- (setq from (buffer-substring (match-end 0) from-end))
- (delete-region (match-end 0) from-end)
- (setq str (wl-set-string-width
- (1+ wl-from-width)
- (format
- "+%s:%s"
- (wl-thread-entity-get-children-num
- entity)
- from)))
- (if wl-summary-highlight
- (put-text-property 0 (length str) 'face text-prop str))
- (insert str)
- (condition-case nil ; it's dangerous, so ignore error.
- (run-hooks 'wl-thread-update-children-number-hook)
- (error
- (ding)
- (message "Error in wl-thread-update-children-number-hook."))))))))
-
-;;
+ (wl-thread-update-line-on-buffer (wl-thread-entity-get-number entity)))
+
+;;
;; Thread oriented commands.
;;
(defun wl-thread-call-region-func (func &optional arg)
(defun wl-thread-msg-mark-as-important (msg)
"Set mark as important for invisible MSG. Modeline is not changed."
- (let* ((msgdb wl-summary-buffer-msgdb)
- (mark-alist (elmo-msgdb-get-mark-alist msgdb))
- cur-mark)
- (setq cur-mark (cadr (assq msg mark-alist)))
- (setq mark-alist
- (elmo-msgdb-mark-set mark-alist
- msg
- (if (string= cur-mark wl-summary-important-mark)
- nil
- wl-summary-important-mark)))
- (elmo-msgdb-set-mark-alist msgdb mark-alist)
+ (let ((msgdb (wl-summary-buffer-msgdb))
+ cur-mark)
+ (setq cur-mark (elmo-msgdb-get-mark msgdb msg))
+ (elmo-msgdb-set-mark msgdb
+ msg
+ (if (string= cur-mark elmo-msgdb-important-mark)
+ nil
+ elmo-msgdb-important-mark))
(wl-summary-set-mark-modified)))
(defun wl-thread-mark-as-read (&optional arg)
(error
(elmo-display-error err t)
nil)))
-
+
(defun wl-thread-delete (&optional arg)
(interactive "P")
(wl-thread-call-region-func 'wl-summary-delete-region arg)
(setq cur (1+ cur))
(if (or (zerop (% cur 2)) (= cur len))
(elmo-display-progress
- 'wl-thread-insert-top "Inserting thread..."
+ 'wl-thread-insert-top "Inserting message..."
(/ (* cur 100) len)))))))
(defsubst wl-thread-insert-entity-sub (indent entity parent-entity all)
- (let ((mark-alist (elmo-msgdb-get-mark-alist wl-summary-buffer-msgdb))
- msg-num
+ (let (msg-num
overview-entity
temp-mark
summary-line)
(setq temp-mark (wl-summary-get-score-mark msg-num)))
(setq overview-entity
(elmo-msgdb-overview-get-entity
- (nth 0 entity) wl-summary-buffer-msgdb))
+ (nth 0 entity) (wl-summary-buffer-msgdb)))
;;; (wl-delete-all-overlays)
(when overview-entity
- (setq summary-line
- (wl-summary-overview-create-summary-line
- msg-num
- overview-entity
- (elmo-msgdb-overview-get-entity
- (nth 0 parent-entity) wl-summary-buffer-msgdb)
- (1+ indent)
- mark-alist
- (if wl-thread-insert-force-opened
- nil
- (wl-thread-maybe-get-children-num msg-num))
- temp-mark entity))
- (wl-summary-insert-line summary-line)))))
+ (wl-summary-insert-line
+ (wl-summary-create-line
+ overview-entity
+ (elmo-msgdb-overview-get-entity
+ (nth 0 parent-entity) (wl-summary-buffer-msgdb))
+ temp-mark
+ (elmo-msgdb-get-mark (wl-summary-buffer-msgdb) msg-num)
+ (if wl-thread-insert-force-opened
+ nil
+ (wl-thread-maybe-get-children-num msg-num))
+ (wl-thread-make-indent-string entity)
+ (wl-thread-entity-get-linked entity)))))))
(defun wl-thread-insert-entity (indent entity parent-entity all)
"Insert thread entity in current buffer."
(defun wl-thread-get-children-msgs-uncached (msg &optional uncached-marks)
(let ((children-msgs (wl-thread-get-children-msgs msg))
- (mark-alist (elmo-msgdb-get-mark-alist wl-summary-buffer-msgdb))
- (number-alist (elmo-msgdb-get-number-alist wl-summary-buffer-msgdb))
+ (number-alist (elmo-msgdb-get-number-alist (wl-summary-buffer-msgdb)))
mark
uncached-list)
(while children-msgs
(if (and (not (eq msg (car children-msgs))) ; except itself
(or (and uncached-marks
- (setq mark (cadr (assq (car children-msgs)
- mark-alist)))
+ (setq mark (elmo-msgdb-get-mark
+ (wl-summary-buffer-msgdb)
+ (car children-msgs)))
(member mark uncached-marks))
(and (not uncached-marks)
- (null (elmo-cache-exists-p
- (cdr (assq (car children-msgs)
- number-alist)))))))
+ (null (elmo-file-cache-exists-p
+ (elmo-message-field
+ wl-summary-buffer-elmo-folder
+ (car children-msgs)
+ 'message-id))))))
(wl-append uncached-list (list (car children-msgs))))
(setq children-msgs (cdr children-msgs)))
uncached-list))
(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))))
-
(defun wl-thread-get-depth-of-current-line ()
- (interactive)
- (save-excursion
- (beginning-of-line)
- (let ((depth 0))
- (if (re-search-forward (concat "^" wl-summary-buffer-number-regexp
- "..../..\(.*\)..:.. ")
- nil t)
- (while (string-match wl-thread-indent-regexp
- (char-to-string
- (char-after (point))))
- (setq depth (1+ depth))
- (forward-char)))
- (/ depth wl-thread-indent-level-internal))))
-
+ (let ((entity (wl-thread-get-entity (wl-summary-message-number)))
+ (depth 0)
+ number)
+ (while (setq number (wl-thread-entity-get-parent entity))
+ (incf depth)
+ (setq entity (wl-thread-get-entity number)))
+ depth))
+
(defun wl-thread-update-indent-string-region (beg end)
(interactive "r")
(save-excursion
(goto-char beg)
(while (< (point) end)
- (wl-thread-update-indent-string)
+ (save-excursion
+ (wl-thread-update-line-on-buffer-sub nil (wl-summary-message-number)))
(forward-line 1))))
(defsubst wl-thread-make-indent-string (entity)
(setq cur (wl-thread-entity-get-parent-entity cur))))
ret-val))
-(defun wl-thread-update-indent-string ()
- "Update indent string of current line."
- (interactive)
- (save-excursion
- (beginning-of-line)
- (let ((inhibit-read-only t)
- (buffer-read-only nil)
- thr-str)
- (when (looking-at (concat "^ *\\([0-9]+\\)"
- "..../..\(.*\)..:.. \\("
- wl-highlight-thread-indent-string-regexp
- "\\)[[<]"))
- (goto-char (match-beginning 2))
- (delete-region (match-beginning 2)
- (match-end 2))
- (setq thr-str
- (wl-thread-make-indent-string
- (wl-thread-get-entity (string-to-int (wl-match-buffer 1)))))
- (if (and wl-summary-width
- wl-summary-indent-length-limit
- (< wl-summary-indent-length-limit
- (string-width thr-str)))
- (setq thr-str (wl-set-string-width
- wl-summary-indent-length-limit
- thr-str)))
- (insert thr-str)
- (if wl-summary-highlight
- (wl-highlight-summary-current-line))))))
-
(defun wl-thread-set-parent (&optional parent-number)
"Set current message's parent interactively."
(interactive)
projects / elisp / wanderlust.git / blobdiff