2004-08-31 Yuuichi Teranishi <teranisi@gohome.org>
+ * wl-vars.el (wl-reply-hook): Abolish.
+ (wl-draft-reply-hook): New hook.
+ (wl-summary-reply-hook): Ditto.
+ (wl-draft-forward-hook): Ditto.
+ (wl-summary-forward-hook): Ditto.
+ (wl-draft-kill-flags): New variable.
+
+ * wl-summary.el (wl-summary-mark-as-answered-region): Use
+ wl-summary-set-persistent-mark-internal.
+ (wl-summary-sync-marks): Use elmo-preserved-flags.
+ (wl-summary-update-persistent-mark): Make it interactive.
+ (wl-summary-set-persistent-mark-internal): New inline function.
+ (wl-summary-mark-as-answered): Use it.
+ (wl-summary-mark-as-unanswered): Ditto.
+ (wl-summary-unset-persistent-mark): New function.
+ (wl-summary-set-persistent-mark): Ditto.
+ (wl-summary-reply): Don't set answered flag;
+ Run wl-summary-reply-hook instead.
+ (wl-summary-forward): Call wl-draft-forward with number.
+ Run wl-summary-forward-hook.
+
+ * wl-highlight.el (wl-summary-persistent-mark-face): New face.
+ (wl-highlight-summary-line-face-spec): Use it as a default
+ persistent mark face.
+
+ * wl-draft.el (wl-draft-forward): Added optional argument number;
+ Set wl-draft-parent-number; Run wl-draft-forward-hook.
+ (wl-draft-reply): Run wl-draft-reply-hook instead of wl-reply-hook.
+ (wl-draft-kill): Use wl-draft-kill-flags.
+
* wl-vars.el (wl-summary-answered-uncached-mark): Fixed typo.
* wl-folder.el (wl-folder-check-one-entity): Follow the change
wl-subject-re-prefix-regexp)))
(t original-subject)))
-(defun wl-draft-forward (original-subject summary-buf)
+(defun wl-draft-forward (original-subject summary-buf &optional number)
(let (references parent-folder subject)
(with-current-buffer summary-buf
(setq parent-folder (wl-summary-buffer-folder-name)))
(cons 'Subject subject)
(cons 'References references))
nil nil nil nil parent-folder))
+ (setq wl-draft-parent-number number)
(goto-char (point-max))
(wl-draft-insert-message)
- (mail-position-on-field "To"))
+ (mail-position-on-field "To")
+ (run-hooks 'wl-draft-forward-hook))
(defun wl-draft-self-reply-p ()
"Return t when From address in the current message is user's self one or not."
(setq wl-draft-config-variables
(append wl-draft-reply-saved-variables
wl-draft-config-variables)))
- (run-hooks 'wl-reply-hook))
+ (run-hooks 'wl-draft-reply-hook))
(defun wl-draft-reply-position (position)
(cond ((eq position 'body)
(string= (wl-summary-buffer-folder-name)
folder-name)))
(with-current-buffer buffer
- (elmo-folder-unset-flag folder (list number) 'answered)
+ (dolist (flag wl-draft-kill-flags)
+ (elmo-folder-unset-flag folder (list number) flag))
(when (wl-summary-jump-to-msg number)
(wl-summary-update-persistent-mark)))
(elmo-folder-open folder 'load-msgdb)
'answered))))
(if (null number-list)
(message "No message.")
- (wl-summary-mark-as-answered-internal remove number-list)
+ (wl-summary-set-persistent-mark-internal remove 'answered
+ number-list)
(wl-summary-count-unread)
(wl-summary-update-modeline))))
(message "Updating marks...")
(dolist (flag elmo-global-flag-list)
- (unless (memq flag '(answered cached new unread))
+ (unless (memq flag elmo-preserved-flags)
(setq diff (elmo-list-diff (elmo-folder-list-flagged
wl-summary-buffer-elmo-folder
flag)
(list flag) 'no-server)
(setq diffs (cdr diffs)))))
- (setq diff (elmo-list-diff (elmo-folder-list-flagged
- wl-summary-buffer-elmo-folder
- 'answered)
- (elmo-folder-list-flagged
- wl-summary-buffer-elmo-folder
- 'answered 'in-msgdb)))
- (setq diffs (cadr diff))
- (setq mes (concat mes (format "-%d" (length diffs))))
- (while diffs
- (wl-summary-mark-as-unanswered (car diffs) 'no-modeline)
- (setq diffs (cdr diffs)))
- (setq diffs (car diff)) ; unread-appends
- (setq mes (concat mes (format "/+%d answered," (length diffs))))
- (while diffs
- (wl-summary-mark-as-answered (car diffs) 'no-modeline)
- (setq diffs (cdr diffs)))
-
- (setq diff (elmo-list-diff (elmo-folder-list-flagged
- wl-summary-buffer-elmo-folder
- 'unread)
- (elmo-folder-list-flagged
- wl-summary-buffer-elmo-folder
- 'unread 'in-msgdb)))
- (setq diffs (cadr diff))
- (setq mes (concat mes (format "-%d" (length diffs))))
- (while diffs
- (wl-summary-mark-as-read (car diffs) 'no-folder 'no-modeline)
- (setq diffs (cdr diffs)))
- (setq diffs (car diff)) ; unread-appends
- (setq mes (concat mes (format "/+%d unread." (length diffs))))
- (while diffs
- (wl-summary-mark-as-unread (car diffs) 'no-folder 'no-modeline)
- (setq diffs (cdr diffs)))
+ (dolist (flag (delete 'new (delete 'cached
+ (copy-sequence elmo-preserved-flags))))
+ (setq diff (elmo-list-diff (elmo-folder-list-flagged
+ wl-summary-buffer-elmo-folder
+ flag)
+ (elmo-folder-list-flagged
+ wl-summary-buffer-elmo-folder
+ flag 'in-msgdb)))
+ (setq diffs (cadr diff))
+ (setq mes (concat mes (format "-%d" (length diffs))))
+ (while diffs
+ (wl-summary-unset-persistent-mark flag (car diffs) 'no-modeline)
+ (setq diffs (cdr diffs)))
+ (setq diffs (car diff)
+ mes (concat mes (format "/+%d %s " (length diffs) flag)))
+ (while diffs
+ (wl-summary-set-persistent-mark flag (car diffs) 'no-modeline)
+ (setq diffs (cdr diffs))))
(if (interactive-p) (message "%s" mes)))))
(defun wl-summary-sync-update (&optional unset-cursor
(setq mark wl-summary-flag-mark)))
(when (memq (car priorities) flags)
(setq mark
- (or (case (car priorities)
- (new
- (if cached
- wl-summary-new-cached-mark
- wl-summary-new-uncached-mark))
- (answered
- (if cached
- wl-summary-answered-cached-mark
- wl-summary-answered-uncached-mark))
- (unread
- (if cached
- wl-summary-unread-cached-mark
- wl-summary-unread-uncached-mark)))))))
+ (let ((var
+ (intern
+ (if cached
+ (format
+ "wl-summary-%s-cached-mark" (car priorities))
+ (format
+ "wl-summary-%s-uncached-mark" (car priorities))))))
+ (if (boundp var)
+ (symbol-value var)
+ (if cached
+ (downcase (substring (symbol-name (car priorities))
+ 0 1))
+ (upcase (substring (symbol-name (car priorities))
+ 0 1))))))))
(setq priorities (cdr priorities)))
(or mark
(if (or cached (elmo-folder-local-p folder))
(defun wl-summary-update-persistent-mark (&optional number flags)
"Synch up persistent mark of current line with msgdb's.
Return non-nil if the mark is updated"
+ (interactive)
(prog1
(when wl-summary-buffer-persistent-mark-column
(save-excursion
no-folder-mark
no-modeline-update))
-(defsubst wl-summary-mark-as-answered-internal (inverse
- &optional
- number-or-numbers
- no-modeline-update)
+(defsubst wl-summary-set-persistent-mark-internal (inverse
+ &optional flag
+ number-or-numbers
+ no-modeline-update)
+ "Set persistent mark."
(save-excursion
(let ((folder wl-summary-buffer-elmo-folder)
number number-list visible)
(if (null number-list)
(message "No message.")
(if inverse
- (elmo-folder-unset-flag folder number-list 'answered)
- (elmo-folder-set-flag folder number-list 'answered))
+ (elmo-folder-unset-flag folder number-list flag)
+ (elmo-folder-set-flag folder number-list flag))
(dolist (number number-list)
(setq visible (wl-summary-jump-to-msg number))
;; set mark on buffer
(+ wl-summary-buffer-unread-count
wl-summary-buffer-new-count)))))))
+(defun wl-summary-unset-persistent-mark (&optional flag
+ number-or-numbers
+ no-modeline-update)
+ "Unset persistent mark."
+ (interactive)
+ (when (interactive-p)
+ (setq flag (intern (downcase
+ (completing-read
+ "Flag: "
+ (mapcar (lambda (flag)
+ (list (capitalize (symbol-name flag))))
+ elmo-preserved-flags)
+ nil
+ 'require-match)))))
+ (wl-summary-set-persistent-mark-internal 'inverse
+ flag
+ number-or-numbers
+ no-modeline-update))
+
+(defun wl-summary-set-persistent-mark (&optional flag
+ number-or-numbers
+ no-modeline-update)
+ "Set persistent mark."
+ (interactive)
+ (when (interactive-p)
+ (setq flag (intern (downcase
+ (completing-read
+ "Flag: "
+ (mapcar (lambda (flag)
+ (list (capitalize (symbol-name flag))))
+ elmo-preserved-flags)
+ nil
+ 'require-match)))))
+ (wl-summary-set-persistent-mark-internal
+ nil
+ flag
+ number-or-numbers
+ no-modeline-update))
+
(defun wl-summary-mark-as-answered (&optional number-or-numbers
no-modeline-update)
(interactive)
- (wl-summary-mark-as-answered-internal
+ (wl-summary-set-persistent-mark-internal
(and (interactive-p)
(elmo-message-flagged-p wl-summary-buffer-elmo-folder
(wl-summary-message-number)
'answered))
+ 'answered
number-or-numbers
no-modeline-update))
(defun wl-summary-mark-as-unanswered (&optional number-or-numbers
no-modeline-update)
- (wl-summary-mark-as-answered-internal 'inverse
- number-or-numbers
- no-modeline-update))
+ (wl-summary-set-persistent-mark-internal
+ 'inverse
+ 'answered
+ number-or-numbers
+ no-modeline-update))
(defun wl-summary-decide-flag (folder number)
(let ((flags (elmo-get-global-flags (elmo-message-flags
(run-hooks 'wl-mail-setup-hook)))
(error (set-window-configuration winconf)
(signal (car err)(cdr err))))
- (with-current-buffer summary-buf
- (elmo-folder-set-flag folder (list number) 'answered)
- (wl-summary-update-persistent-mark))
+ (with-current-buffer summary-buf (run-hooks 'wl-summary-reply-hook))
t)))
(defun wl-summary-write ()
(elmo-message-entity folder number) 'subject 'decode)
""))))
(set-buffer mes-buf)
- (wl-draft-forward subject summary-buf)
+ (wl-draft-forward subject summary-buf number)
+ (with-current-buffer summary-buf (run-hooks 'wl-summary-forward-hook))
(unless without-setup-hook
(run-hooks 'wl-mail-setup-hook)))))
reasons of system internal to accord facilities for the Emacs variants.")
(defvar wl-hook nil
"A hook called when Wanderlust is invoked.")
-(defvar wl-reply-hook nil
- "A hook called when replied.")
+
+(defvar wl-draft-reply-hook nil
+ "A hook called when replied.
+This hook runs on the draft buffer.")
+
+(defvar wl-draft-forward-hook nil
+ "A hook called when forwarded.
+This hook runs on the draft buffer.")
+
+(defvar wl-summary-reply-hook
+ '((lambda () (wl-summary-set-persistent-mark 'answered)))
+ "A hook called when `wl-summary-reply' is called.
+This hook runs on the summary buffer.")
+
+(defvar wl-summary-forward-hook nil
+ "A hook called when `wl-summary-forward' is called.
+This hook runs on the summary buffer.")
+
(defvar wl-mail-setup-hook nil
"A hook called when Draft is prepared.")
(defvar wl-draft-reedit-hook '(wl-draft-remove-text-plain-tag)
:group 'wl-pref
:group 'wl-draft)
+(defcustom wl-draft-kill-flags '(answered)
+ "Remove specified flags when parent message of current draft is killed."
+ :type '(repeat (symbol :tag "flag"))
+ :group 'wl-draft)
+
(defcustom wl-subject-re-prefix-regexp "^[ \t]*\\([Rr][Ee][:>][ \t]*\\)*[ \t]*"
"*Regexp matching \"Re: \" in the subject line."
:type 'regexp
projects / elisp / wanderlust.git / commitdiff