(defvar elmo-imap4-disuse-server-flag-mailbox-regexp "^#mh" ; UW imapd
"Regexp to match IMAP4 mailbox names whose message flags on server should be ignored.
-(Except `\\Deleted' flag).")
+\(Except `\\Deleted' flag\).")
(defvar elmo-imap4-overview-fetch-chop-length 200
"*Number of overviews to fetch in one request.")
(defvar elmo-imap4-use-select-to-update-status nil
"*Some imapd have to send select command to update status.
-(ex. UW imapd 4.5-BETA?). For these imapd, you must set this variable t.")
+\(ex. UW imapd 4.5-BETA?\). For these imapd, you must set this variable t.")
(defvar elmo-imap4-use-modified-utf7 nil
"*Use mofidied UTF-7 (rfc2060) encoding for IMAP4 folder name.")
(defvar elmo-imap4-extra-namespace-alist
'(("^\\({.*/nntp}\\).*$" . ".")) ; Default is for UW's remote nntp mailbox...
- "Extra namespace alist.
+ "Extra namespace alist.
A list of cons cell like: (REGEXP . DELIMITER).
REGEXP should have a grouping for namespace prefix.")
;;
"Returns non-nil if RESPONSE is an 'BYE' response."
(` (assq 'bye (, response))))
+(defmacro elmo-imap4-response-garbage-p (response)
+ "Returns non-nil if RESPONSE is an 'garbage' response."
+ (` (assq 'garbage (, response))))
+
(defmacro elmo-imap4-response-value (response symbol)
"Get value of the SYMBOL from RESPONSE."
(` (nth 1 (assq (, symbol) (, response)))))
(when (elmo-imap4-response-bye-p elmo-imap4-current-response)
(elmo-imap4-process-bye session))
(setq elmo-imap4-current-response nil)
- (if elmo-imap4-parsing
- (error "IMAP process is running. Please wait (or plug again)"))
+ (when elmo-imap4-parsing
+ (message "Waiting for IMAP response...")
+ (accept-process-output (elmo-network-session-process-internal
+ session))
+ (message "Waiting for IMAP response...done"))
(setq elmo-imap4-parsing t)
(elmo-imap4-debug "<-(%s)- %s" tag command)
(while (setq token (car command-args))
(with-current-buffer (process-buffer
(elmo-network-session-process-internal session))
(while (not (or (string= tag elmo-imap4-reached-tag)
- (elmo-imap4-response-bye-p elmo-imap4-current-response)))
+ (elmo-imap4-response-bye-p elmo-imap4-current-response)
+ (when (elmo-imap4-response-garbage-p
+ elmo-imap4-current-response)
+ (message "Garbage response: %s"
+ (elmo-imap4-response-value
+ elmo-imap4-current-response
+ 'garbage))
+ t)))
(when (memq (process-status
(elmo-network-session-process-internal session))
'(open run))
(with-current-buffer (elmo-network-session-buffer session)
(setq elmo-imap4-fetch-callback nil)
(setq elmo-imap4-fetch-callback-data nil))
- (elmo-imap4-send-command-wait session "check"))
+ (elmo-imap4-send-command session "check"))
(defun elmo-imap4-atom-p (string)
"Return t if STRING is an atom defined in rfc2060."
(mapcar
(lambda (entry)
(if (and (eq 'list (car entry))
- (not (member "\\NoSelect" (nth 1 (nth 1 entry)))))
+ (not (elmo-string-member-ignore-case "\\Noselect" (nth 1 (nth 1 entry)))))
(car (nth 1 entry))))
response)))
(elmo-imap4-response-bye-p response))
(elmo-imap4-process-bye session)
(unless no-error
- (error (or
- (elmo-imap4-response-error-text response)
- (format "Select %s failed" mailbox)))))))
+ (error "%s"
+ (or (elmo-imap4-response-error-text response)
+ (format "Select %s failed" mailbox)))))))
(and result response))))
(defun elmo-imap4-check-validity (spec validity-file)
"search %s") flag))
'search)))
-(static-cond
- ((fboundp 'float)
- ;; Emacs can parse dot symbol.
- (defvar elmo-imap4-rfc822-size "RFC822\.SIZE")
- (defvar elmo-imap4-rfc822-text "RFC822\.TEXT")
- (defvar elmo-imap4-rfc822-header "RFC822\.HEADER")
- (defvar elmo-imap4-rfc822-size "RFC822\.SIZE")
- (defvar elmo-imap4-header-fields "HEADER\.FIELDS")
- (defmacro elmo-imap4-replace-dot-symbols ()) ;; noop
- (defalias 'elmo-imap4-fetch-read 'read)
- )
- (t
- ;;; For Nemacs.
- ;; Cannot parse dot symbol.
- (defvar elmo-imap4-rfc822-size "RFC822_SIZE")
- (defvar elmo-imap4-header-fields "HEADER_FIELDS")
- (defvar elmo-imap4-rfc822-size "RFC822_SIZE")
- (defvar elmo-imap4-rfc822-text "RFC822_TEXT")
- (defvar elmo-imap4-rfc822-header "RFC822_HEADER")
- (defvar elmo-imap4-header-fields "HEADER_FIELDS")
- (defun elmo-imap4-fetch-read (buffer)
- (with-current-buffer buffer
- (let ((beg (point))
- token)
- (when (re-search-forward "[[ ]" nil t)
- (goto-char (match-beginning 0))
- (setq token (buffer-substring beg (point)))
- (cond ((string= token "RFC822.SIZE")
- (intern elmo-imap4-rfc822-size))
- ((string= token "RFC822.HEADER")
- (intern elmo-imap4-rfc822-header))
- ((string= token "RFC822.TEXT")
- (intern elmo-imap4-rfc822-text))
- ((string= token "HEADER\.FIELDS")
- (intern elmo-imap4-header-fields))
- (t (goto-char beg)
- (elmo-read (current-buffer))))))))))
+(defvar elmo-imap4-rfc822-size "RFC822\.SIZE")
+(defvar elmo-imap4-rfc822-text "RFC822\.TEXT")
+(defvar elmo-imap4-rfc822-header "RFC822\.HEADER")
+(defvar elmo-imap4-header-fields "HEADER\.FIELDS")
(defun elmo-imap4-make-number-set-list (msg-list &optional chop-length)
"Make RFC2060's message set specifier from MSG-LIST.
;;
;; app-data:
-;; cons of seen-list and result of use-flag-p.
+;; cons of flag-table and result of use-flag-p.
(defsubst elmo-imap4-fetch-callback-1-subr (entity flags app-data)
"A msgdb entity callback function."
(let* ((use-flag (cdr app-data))
(app-data (car app-data))
- (seen (member (car entity) app-data))
mark)
- (if (member "\\Flagged" flags)
+ (if (elmo-string-member-ignore-case "\\Flagged" flags)
(elmo-msgdb-global-mark-set (car entity)
elmo-msgdb-important-mark))
(if (setq mark (elmo-msgdb-global-mark-get (car entity)))
- (unless (member "\\Seen" flags)
+ (unless (elmo-string-member-ignore-case "\\Seen" flags)
(setq elmo-imap4-seen-messages
(cons
(elmo-msgdb-overview-entity-get-number entity)
(setq mark (or (if (elmo-file-cache-status
(elmo-file-cache-get (car entity)))
;; cached.
- (if (member "\\Answered" flags)
+ (if (elmo-string-member-ignore-case
+ "\\Answered" flags)
elmo-msgdb-answered-cached-mark
- (if (or seen
- (and use-flag
- (member "\\Seen" flags)))
+ (if (and use-flag
+ (member "\\Seen" flags))
nil
elmo-msgdb-unread-cached-mark))
- (if (member "\\Answered" flags)
+ (if (elmo-string-member-ignore-case "\\Answered" flags)
elmo-msgdb-answered-uncached-mark
- (if (or seen
- (and use-flag
- (member "\\Seen" flags)))
+ (if (and use-flag
+ (elmo-string-member-ignore-case
+ "\\Seen" flags))
(if elmo-imap4-use-cache
elmo-msgdb-read-uncached-mark)
elmo-msgdb-new-mark))))))
(defun elmo-imap4-parse-capability (string)
(if (string-match "^\\*\\(.*\\)$" string)
- (elmo-read
+ (read
(concat "(" (downcase (elmo-match-string 1 string)) ")"))))
(defun elmo-imap4-clear-login (session)
(defun elmo-imap4-parse-response ()
"Parse a IMAP command response."
(let (token)
- (case (setq token (elmo-read (current-buffer)))
+ (case (setq token (read (current-buffer)))
(+ (progn
(skip-chars-forward " ")
(list 'continue-req (buffer-substring (point) (point-max)))))
- (* (case (prog1 (setq token (elmo-read (current-buffer)))
+ (* (case (prog1 (setq token (read (current-buffer)))
(elmo-imap4-forward))
(OK (elmo-imap4-parse-resp-text-code))
(NO (elmo-imap4-parse-resp-text-code))
(LSUB (list 'lsub (elmo-imap4-parse-data-list)))
(SEARCH (list
'search
- (elmo-read (concat "("
+ (read (concat "("
(buffer-substring (point) (point-max))
")"))))
(STATUS (elmo-imap4-parse-status))
;; Added
(NAMESPACE (elmo-imap4-parse-namespace))
(CAPABILITY (list 'capability
- (elmo-read
+ (read
(concat "(" (downcase (buffer-substring
(point) (point-max)))
")"))))
(ACL (elmo-imap4-parse-acl))
- (t (case (prog1 (elmo-read (current-buffer))
+ (t (case (prog1 (read (current-buffer))
(elmo-imap4-forward))
(EXISTS (list 'exists token))
(RECENT (list 'recent token))
(t (list 'garbage (buffer-string)))))))
(t (if (not (string-match elmo-imap4-seq-prefix (symbol-name token)))
(list 'garbage (buffer-string))
- (case (prog1 (elmo-read (current-buffer))
+ (case (prog1 (read (current-buffer))
(elmo-imap4-forward))
(OK (progn
(setq elmo-imap4-parsing nil)
(cond ((search-forward "PERMANENTFLAGS " nil t)
(list 'permanentflags (elmo-imap4-parse-flag-list)))
((search-forward "UIDNEXT " nil t)
- (list 'uidnext (elmo-read (current-buffer))))
+ (list 'uidnext (read (current-buffer))))
((search-forward "UNSEEN " nil t)
- (list 'unseen (elmo-read (current-buffer))))
+ (list 'unseen (read (current-buffer))))
((looking-at "UIDVALIDITY \\([0-9]+\\)")
(list 'uidvalidity (match-string 1)))
((search-forward "READ-ONLY" nil t)
(let (element list)
(while (not (eq (char-after (point)) ?\)))
(elmo-imap4-forward)
- (let ((token (elmo-imap4-fetch-read (current-buffer))))
+ (let ((token (read (current-buffer))))
(elmo-imap4-forward)
(setq element
(cond ((eq token 'UID)
(list 'uid (condition-case nil
- (elmo-read (current-buffer))
+ (read (current-buffer))
(error nil))))
((eq token 'FLAGS)
(list 'flags (elmo-imap4-parse-flag-list)))
((eq token (intern elmo-imap4-rfc822-text))
(list 'rfc822text (elmo-imap4-parse-nstring)))
((eq token (intern elmo-imap4-rfc822-size))
- (list 'rfc822size (elmo-read (current-buffer))))
+ (list 'rfc822size (read (current-buffer))))
((eq token 'BODY)
(if (eq (char-before) ?\[)
(list
(while (not (eq (char-after (point)) ?\)))
(setq status
(cons
- (let ((token (elmo-read (current-buffer))))
+ (let ((token (read (current-buffer))))
(cond ((eq token 'MESSAGES)
- (list 'messages (elmo-read (current-buffer))))
+ (list 'messages (read (current-buffer))))
((eq token 'RECENT)
- (list 'recent (elmo-read (current-buffer))))
+ (list 'recent (read (current-buffer))))
((eq token 'UIDNEXT)
- (list 'uidnext (elmo-read (current-buffer))))
+ (list 'uidnext (read (current-buffer))))
((eq token 'UIDVALIDITY)
(and (looking-at " \\([0-9]+\\)")
(prog1 (list 'uidvalidity (match-string 1))
(goto-char (match-end 1)))))
((eq token 'UNSEEN)
- (list 'unseen (elmo-read (current-buffer))))
+ (list 'unseen (read (current-buffer))))
(t
(message
"Unknown status data %s in mailbox %s ignored"
token mailbox))))
- status))))
+ status))
+ (skip-chars-forward " ")))
(and elmo-imap4-status-callback
(funcall elmo-imap4-status-callback
status
(nconc
(copy-sequence elmo-imap4-extra-namespace-alist)
(elmo-imap4-parse-namespace-subr
- (elmo-read (concat "(" (buffer-substring
- (point) (point-max))
- ")"))))))
+ (read (concat "(" (buffer-substring
+ (point) (point-max))
+ ")"))))))
(defun elmo-imap4-parse-namespace-subr (ns)
(let (prefix delim namespace-alist default-delim)
(setq mailbox "inbox"))
(if (eq (string-to-char mailbox) ?/)
(setq mailbox (substring mailbox 1 (length mailbox))))
- (expand-file-name
- mailbox
+ ;; don't use expand-file-name (e.g. %~/something)
+ (concat
(expand-file-name
(or (elmo-net-folder-user-internal folder) "nobody")
(expand-file-name (or (elmo-net-folder-server-internal folder)
"nowhere")
(expand-file-name
"imap"
- elmo-msgdb-directory)))))))
+ elmo-msgdb-directory)))
+ "/" mailbox))))
(luna-define-method elmo-folder-status-plugged ((folder
elmo-imap4-folder))
(defun elmo-imap4-folder-list-any-plugged (folder)
(elmo-imap4-list folder "or answered or unseen flagged"))
+(defun elmo-imap4-folder-list-digest-plugged (folder)
+ (elmo-imap4-list folder "or unseen flagged"))
+
(luna-define-method elmo-folder-use-flag-p ((folder elmo-imap4-folder))
(not (string-match elmo-imap4-disuse-server-flag-mailbox-regexp
(elmo-imap4-folder-mailbox-internal folder))))
(let* ((root (elmo-imap4-folder-mailbox-internal folder))
(session (elmo-imap4-get-session folder))
(prefix (elmo-folder-prefix-internal folder))
- (delim (or
- (cdr
+ (namespace-assoc
(elmo-string-matched-assoc
root
(with-current-buffer (elmo-network-session-buffer session)
elmo-imap4-server-namespace)))
+ (delim (or (cdr namespace-assoc)
elmo-imap4-default-hierarchy-delimiter))
;; Append delimiter when root with namespace.
- (root (if (and (match-end 1)
+ (root (if (and namespace-assoc
+ (match-end 1)
(string= (substring root (match-end 1))
""))
(concat root delim)
(luna-define-method elmo-folder-writable-p ((folder elmo-imap4-folder))
t)
-(luna-define-method elmo-folder-delete :before ((folder elmo-imap4-folder))
- (let ((session (elmo-imap4-get-session folder))
- msgs)
- (when (elmo-imap4-folder-mailbox-internal folder)
- (when (setq msgs (elmo-folder-list-messages folder))
- (elmo-folder-delete-messages folder msgs))
- (elmo-imap4-send-command-wait session "close")
- (elmo-imap4-send-command-wait
- session
- (list "delete "
- (elmo-imap4-mailbox
- (elmo-imap4-folder-mailbox-internal folder)))))))
+(luna-define-method elmo-folder-delete ((folder elmo-imap4-folder))
+ (let ((msgs (and (elmo-folder-exists-p folder)
+ (elmo-folder-list-messages folder))))
+ (when (yes-or-no-p (format "%sDelete msgdb and substance of \"%s\"? "
+ (if (> (length msgs) 0)
+ (format "%d msg(s) exists. " (length msgs))
+ "")
+ (elmo-folder-name-internal folder)))
+ (let ((session (elmo-imap4-get-session folder)))
+ (when (elmo-imap4-folder-mailbox-internal folder)
+ (when msgs (elmo-folder-delete-messages folder msgs))
+ (elmo-imap4-send-command-wait session "close")
+ (elmo-imap4-send-command-wait
+ session
+ (list "delete "
+ (elmo-imap4-mailbox
+ (elmo-imap4-folder-mailbox-internal folder))))))
+ (elmo-msgdb-delete-path folder)
+ t)))
(luna-define-method elmo-folder-rename-internal ((folder elmo-imap4-folder)
new-folder)
(luna-define-method elmo-folder-delete-messages-plugged
((folder elmo-imap4-folder) numbers)
(let ((session (elmo-imap4-get-session folder)))
- (elmo-imap4-set-flag folder numbers "\\Deleted")
- (elmo-imap4-send-command-wait session "expunge")))
+ (elmo-imap4-session-select-mailbox
+ session
+ (elmo-imap4-folder-mailbox-internal folder))
+ (unless (elmo-imap4-set-flag folder numbers "\\Deleted")
+ (error "Failed to set deleted flag"))
+ (elmo-imap4-send-command session "expunge")))
(defmacro elmo-imap4-detect-search-charset (string)
(` (with-temp-buffer
numbers)))
(mapcar '(lambda (x) (delete x numbers)) rest)
numbers))
- ((string= "mark" search-key)
+ ((string= "flag" search-key)
(cond
((string= "unread" (elmo-filter-value filter))
(elmo-folder-list-unreads folder))
(elmo-folder-list-importants folder))
((string= "answered" (elmo-filter-value filter))
(elmo-folder-list-answereds folder))
+ ((string= "digest" (elmo-filter-value filter))
+ (elmo-imap4-folder-list-digest-plugged folder))
((string= "any" (elmo-filter-value filter))
(elmo-imap4-folder-list-any-plugged folder))))
((or (string= "since" search-key)
(luna-call-next-method)))
(luna-define-method elmo-folder-msgdb-create-plugged
- ((folder elmo-imap4-folder) numbers seen-list)
+ ((folder elmo-imap4-folder) numbers flag-table)
(when numbers
(let ((session (elmo-imap4-get-session folder))
(headers
elmo-msgdb-extra-fields))
(total 0)
(length (length numbers))
+ print-length print-depth
rfc2060 set-list)
(setq rfc2060 (memq 'imap4rev1
(elmo-imap4-session-capability-internal
(setq elmo-imap4-current-msgdb nil
elmo-imap4-seen-messages nil
elmo-imap4-fetch-callback 'elmo-imap4-fetch-callback-1
- elmo-imap4-fetch-callback-data (cons seen-list
+ elmo-imap4-fetch-callback-data (cons flag-table
(elmo-folder-use-flag-p
folder)))
(while set-list
(elmo-imap4-session-set-current-mailbox-internal session nil)
(if (elmo-imap4-response-bye-p response)
(elmo-imap4-process-bye session)
- (error (or
- (elmo-imap4-response-error-text response)
- (format "Select %s failed" mailbox)))))
+ (error "%s"
+ (or (elmo-imap4-response-error-text response)
+ (format "Select %s failed" mailbox)))))
(message "Selecting %s...done"
(elmo-folder-name-internal folder))
(elmo-folder-set-msgdb-internal
(elmo-imap4-folder-mailbox-internal folder)))))
(luna-define-method elmo-folder-append-buffer
- ((folder elmo-imap4-folder) unread &optional number)
+ ((folder elmo-imap4-folder) &optional flag number)
(if (elmo-folder-plugged-p folder)
(let ((session (elmo-imap4-get-session folder))
send-buffer result)
"append "
(elmo-imap4-mailbox (elmo-imap4-folder-mailbox-internal
folder))
- (if unread " () " " (\\Seen) ")
+ (cond
+ ((eq flag 'read) " (\\Seen) ")
+ ((eq flag 'answered) " (\\Answered)")
+ (t " () "))
(elmo-imap4-buffer-literal send-buffer))))
(kill-buffer send-buffer))
result)
;; Unplugged
(if elmo-enable-disconnected-operation
- (elmo-folder-append-buffer-dop folder unread number)
+ (elmo-folder-append-buffer-dop folder flag number)
(error "Unplugged"))))
(eval-when-compile
(unless elmo-inhibit-display-retrieval-progress
(elmo-display-progress 'elmo-imap4-display-literal-progress
"Retrieving..." 100) ; remove progress bar.
- (message "Retrieving...done."))
+ (message "Retrieving...done"))
(if (setq response (elmo-imap4-response-bodydetail-text
(elmo-imap4-response-value-all
response 'fetch)))
projects / elisp / wanderlust.git / blobdiff