+2005-03-14 Yoichi NAKAYAMA <yoichi@geiin.org>
+
+ * elmo-flag.el (elmo-global-flags-initialize): Don't include
+ member of elmo-local-flags.
+
2005-03-13 Yuuichi Teranishi <teranisi@gohome.org>
* elmo-version.el (elmo-version): Up to 2.14.0.
(defun elmo-global-flags-initialize (&optional additional-flags)
(let ((dir (expand-file-name "flag" elmo-msgdb-directory)))
(setq elmo-global-flags
- (elmo-uniq-list
- (append
- elmo-global-flags
- additional-flags
- (mapcar 'intern
- (delete ".." (delete "." (directory-files dir)))))))))
+ (elmo-list-delete
+ elmo-local-flags
+ (elmo-uniq-list
+ (append
+ elmo-global-flags
+ additional-flags
+ (mapcar 'intern
+ (delete ".." (delete "." (directory-files dir))))))))))
;;; To migrate from global mark folder
(defvar elmo-global-mark-filename "global-mark"
+2005-03-20 Yoichi NAKAYAMA <yoichi@geiin.org>
+
+ * wl-fldmgr.el (wl-fldmgr-add): Create folder after testing parent
+ group is access or not (it is not strict, like wl-fldmgr-rename).
+
+2005-03-17 Yoichi NAKAYAMA <yoichi@geiin.org>
+
+ * wl-thread.el (wl-thread-update-line-on-buffer-sub): Avoid
+ duplicate call of `wl-summary-print-argument' on the wrong line.
+
+2005-03-17 Hiroya Murata <lapis-lazuli@pop06.odn.ne.jp>
+
+ * wl-summary.el (wl-summary-jump-to-msg): Don't interactive input
+ even if argument `number' is nil.
+ (wl-summary-insert-line): Print action argument if current message
+ has it.
+
+2005-03-16 Hiroya Murata <lapis-lazuli@pop06.odn.ne.jp>
+
+ * wl-draft.el (wl-draft-forward): Call `wl-draft' with number.
+ (wl-draft-reply): Ditto.
+ (wl-draft): Add optional argument `parent-number' and call
+ `wl-draft-create-buffer' with it.
+ (wl-draft-create-buffer): Add optional argument
+ `parent-number'. Set wl-draft-parent-number as it.
+
+2005-03-13 Yoichi NAKAYAMA <yoichi@geiin.org>
+
+ * wl-folder.el (wl-folder-set-persistent-mark): If summary
+ buffer is not for given folder, don't use it.
+
2005-03-13 Yuuichi Teranishi <teranisi@gohome.org>
* Version number is increased to 2.14.0.
(wl-draft (list (cons 'To "")
(cons 'Subject subject)
(cons 'References references))
- nil nil nil nil parent-folder))
- (setq wl-draft-parent-number number)
+ nil nil nil nil parent-folder number))
(goto-char (point-max))
(wl-draft-insert-message)
(mail-position-on-field "To")
(cons 'In-Reply-To in-reply-to)
(cons 'References references)
(cons 'Mail-Followup-To mail-followup-to))
- nil nil nil nil parent-folder)
- (setq wl-draft-parent-number number)
+ nil nil nil nil parent-folder number)
(setq wl-draft-reply-buffer buf)
(setq wl-draft-config-variables
(append wl-draft-parent-variables
(defun wl-draft (&optional header-alist
content-type content-transfer-encoding
body edit-again
- parent-folder)
+ parent-folder
+ parent-number)
"Write and send mail/news message with Wanderlust."
(interactive)
(require 'wl)
(wl-set-save-drafts)
(let (buffer header-alist-internal)
- (setq buffer (wl-draft-create-buffer parent-folder))
+ (setq buffer (wl-draft-create-buffer parent-folder parent-number))
(unless (cdr (assq 'From header-alist))
(setq header-alist
(append (list (cons 'From wl-from)) header-alist)))
(goto-char (point-max))))
buffer))
-(defun wl-draft-create-buffer (&optional parent-folder)
+(defun wl-draft-create-buffer (&optional parent-folder parent-number)
(let* ((draft-folder (wl-draft-get-folder))
(parent-folder (or parent-folder (wl-summary-buffer-folder-name)))
(summary-buf (wl-summary-get-buffer parent-folder))
(setq wl-sent-message-queued nil)
(setq wl-draft-config-exec-flag t)
(setq wl-draft-parent-folder (or parent-folder ""))
+ (setq wl-draft-parent-number parent-number)
(or (eq this-command 'wl-folder-write-current-folder)
(setq wl-draft-buffer-cur-summary-buffer summary-buf))
buffer))
(setq indent (wl-fldmgr-make-indent (nth 1 tmp)))
(or name
(setq name (wl-fldmgr-read-string
- (wl-summary-read-folder wl-default-folder "to add"))))
- ;; maybe add elmo-plugged-alist.
- (elmo-folder-set-plugged (wl-folder-get-elmo-folder
- (if (listp name) (car name) name))
- wl-plugged t)
- (when (setq diffs
- (wl-add-entity
- path (list name) wl-folder-entity (nth 3 tmp) t))
- (wl-folder-insert-entity indent name)
- (wl-fldmgr-update-group path diffs)
- (setq wl-fldmgr-modified t)
- (set-buffer-modified-p nil)
- (setq ret-val t)))
- ret-val)))
+ (wl-summary-read-folder wl-default-folder
+ "to add" nil t))))
+ (let ((parent (nth 2 (wl-fldmgr-get-path-from-buffer))))
+ (if (eq (cdr parent) 'access)
+ (if (string-match
+ (format "^%s" (regexp-quote (car parent))) name)
+ ;; force update access group
+ (progn
+ (wl-folder-confirm-existence
+ (wl-folder-get-elmo-folder name))
+ (wl-folder-open-close)
+ (wl-folder-jump-to-current-entity t)
+ (setq ret-val t))
+ (error "Can't insert folder under access group"))
+ (wl-folder-confirm-existence (wl-folder-get-elmo-folder name))
+ ;; maybe add elmo-plugged-alist.
+ (elmo-folder-set-plugged (wl-folder-get-elmo-folder
+ (if (listp name) (car name) name))
+ wl-plugged t)
+ (when (setq diffs
+ (wl-add-entity
+ path (list name) wl-folder-entity (nth 3 tmp) t))
+ (wl-folder-insert-entity indent name)
+ (wl-fldmgr-update-group path diffs)
+ (setq wl-fldmgr-modified t)
+ (set-buffer-modified-p nil)
+ (setq ret-val t)))
+ ret-val)))))
(defun wl-fldmgr-delete ()
(interactive)
(defun wl-folder-set-persistent-mark (folder number flag)
"Set a persistent mark which corresponds to the specified flag on message."
- (let ((buffer (wl-summary-get-buffer folder))
- elmo-folder)
- (if buffer
+ (let ((buffer (wl-summary-get-buffer folder)))
+ (if (and buffer
+ (with-current-buffer buffer
+ (string= wl-summary-buffer-folder-name folder)))
(with-current-buffer buffer
(wl-summary-set-persistent-mark flag number))
;; Parent buffer does not exist.
- (when (setq elmo-folder (and folder
- (wl-folder-get-elmo-folder folder)))
+ (let ((elmo-folder (wl-folder-get-elmo-folder folder)))
(elmo-folder-open elmo-folder 'load-msgdb)
(elmo-folder-set-flag elmo-folder (list wl-draft-parent-number) flag)
(elmo-folder-close elmo-folder)))))
(funcall wl-summary-buffer-mode-line-formatter)))
(defun wl-summary-jump-to-msg (&optional number beg end)
- (interactive "NJump to Number:")
- (let ((num (or number
- (string-to-int
- (read-from-minibuffer "Jump to Message(No.): "))))
- (pos (point))
- regexp)
- (setq regexp (concat "\r" (int-to-string num) "[^0-9]"))
- (if (and beg end (or (< pos beg) (< end pos)))
- (progn
- (goto-char beg)
- (if (re-search-forward regexp end t)
- (progn (backward-char 1) (beginning-of-line) t)
- (goto-char pos)
- nil))
- (beginning-of-line)
- (if (or (and (re-search-forward regexp end t)
- (progn (backward-char 1) t))
- (re-search-backward regexp beg t))
- (progn (beginning-of-line) t)
- nil))))
+ (interactive "NJump to Message (No.): ")
+ (when number
+ (let ((pos (point))
+ regexp)
+ (setq regexp (concat "\r" (int-to-string number) "[^0-9]"))
+ (if (and beg end (or (< pos beg) (< end pos)))
+ (progn
+ (goto-char beg)
+ (if (re-search-forward regexp end t)
+ (progn (backward-char 1) (beginning-of-line) t)
+ (goto-char pos)
+ nil))
+ (beginning-of-line)
+ (if (or (and (re-search-forward regexp end t)
+ (progn (backward-char 1) t))
+ (re-search-backward regexp beg t))
+ (progn (beginning-of-line) t)
+ nil)))))
(defun wl-summary-highlight-msgs (msgs)
(save-excursion
(save-excursion (end-of-line)(point))
'mouse-face nil))
(insert line "\n")
+ (save-excursion
+ (forward-line -1)
+ (let* ((number (wl-summary-message-number))
+ (mark-info (wl-summary-registered-temp-mark number)))
+ (when (and mark-info (nth 2 mark-info))
+ (wl-summary-print-argument number (nth 2 mark-info)))))
(if wl-use-highlight-mouse-line
;; remove 'mouse-face of current line.
(put-text-property
(parent-msg (or parent-msg (wl-thread-entity-get-parent entity)))
(buffer-read-only nil)
(inhibit-read-only t)
- message-entity temp-mark summary-line invisible-top dest-pair)
+ message-entity temp-mark summary-line invisible-top)
(if (wl-thread-delete-line-from-buffer msg)
(progn
(cond
((memq msg wl-summary-buffer-target-mark-list)
(setq temp-mark "*"))
((setq temp-mark (wl-summary-registered-temp-mark msg))
- (setq dest-pair (cons (nth 0 temp-mark)(nth 2 temp-mark))
- temp-mark (nth 1 temp-mark)))
+ (setq temp-mark (nth 1 temp-mark)))
(t (setq temp-mark (wl-summary-get-score-mark msg))))
(when (setq message-entity
(elmo-message-entity wl-summary-buffer-elmo-folder
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-argument (car dest-pair)
- (cdr dest-pair)))))
+ (wl-thread-entity-get-linked entity)))))
;; insert thread (moving thread)
(if (not (setq invisible-top
(wl-thread-entity-parent-invisible-p entity)))
projects / elisp / wanderlust.git / commitdiff