--- nnimap.el.bak 2015-05-26 19:28:32.453605543 -0700 +++ nnimap.el 2015-05-26 21:10:58.221688253 -0700 @@ -134,6 +134,10 @@ likely value would be \"text/\" to automatically fetch all textual parts.") +(defvoo nnimap-hide-deleted nil + "If non-nil, articles flagged as deleted (using the IMAP +\\Delete flag) will not be shown in the Summary buffer.") + (defgroup nnimap nil "IMAP for Gnus." :group 'gnus) @@ -180,7 +184,7 @@ (nnimap-find-process-buffer nntp-server-buffer)) (defun nnimap-header-parameters () - (format "(UID RFC822.SIZE BODYSTRUCTURE %s)" + (format "(UID FLAGS RFC822.SIZE BODYSTRUCTURE %s)" (format (if (nnimap-ver4-p) "BODY.PEEK[HEADER.FIELDS %s]" @@ -239,12 +243,17 @@ (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position) t) (match-string 1))) - (setq lines nil) + (setq flags + (and (re-search-forward "FLAGS (\\([^)]+\\))" + (line-end-position) + t) + (split-string (match-string 1)))) (setq size (and (re-search-forward "RFC822.SIZE \\([0-9]+\\)" (line-end-position) t) (match-string 1))) + (setq lines nil) (beginning-of-line) (when (search-forward "BODYSTRUCTURE" (line-end-position) t) (let ((structure (ignore-errors @@ -258,20 +267,25 @@ (equal (upcase (nth 1 structure)) "RFC822")) (nth 9 structure) (nth 7 structure))))) - (delete-region (line-beginning-position) (line-end-position)) - (insert (format "211 %s Article retrieved." article)) - (forward-line 1) - (when size - (insert (format "Chars: %s\n" size))) - (when lines - (insert (format "Lines: %s\n" lines))) - ;; Most servers have a blank line after the headers, but - ;; Davmail doesn't. - (unless (re-search-forward "^\r$\\|^)\r?$" nil t) - (goto-char (point-max))) - (delete-region (line-beginning-position) (line-end-position)) - (insert ".") - (forward-line 1))))) + (if (and nnimap-hide-deleted + (member "\\Deleted" flags)) + (delete-region (line-beginning-position) + (or (re-search-forward "^\r$\\|^)\r?$" nil t) + (point-max))) + (delete-region (line-beginning-position) (line-end-position)) + (insert (format "211 %s Article retrieved." article)) + (forward-line 1) + (when size + (insert (format "Chars: %s\n" size))) + (when lines + (insert (format "Lines: %s\n" lines))) + ;; Most servers have a blank line after the headers, but + ;; Davmail doesn't. + (unless (re-search-forward "^\r$\\|^)\r?$" nil t) + (goto-char (point-max))) + (delete-region (line-beginning-position) (line-end-position)) + (insert ".") + (forward-line 1)))))) (defun nnimap-unfold-quoted-lines () ;; Unfold quoted {number} strings.