From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/86022 Path: news.gmane.org!not-for-mail From: Nikolaus Rath Newsgroups: gmane.emacs.gnus.general Subject: [PATCH] Support hiding deleted IMAP messages (v3) Date: Thu, 02 Jul 2015 19:17:28 -0700 Message-ID: <87pp4a9e87.fsf@vostro.rath.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1435889910 7747 80.91.229.3 (3 Jul 2015 02:18:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Jul 2015 02:18:30 +0000 (UTC) To: ding@gnus.org, 20672@debbugs.gnu.org Original-X-From: ding-owner+M34257@lists.math.uh.edu Fri Jul 03 04:18:19 2015 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from lists1.math.uh.edu ([129.7.128.208]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZAqYU-0004mH-N4 for ding-account@gmane.org; Fri, 03 Jul 2015 04:18:18 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by lists1.math.uh.edu with smtp (Exim 4.84) (envelope-from ) id 1ZAqXn-0006dH-Rz; Thu, 02 Jul 2015 21:17:35 -0500 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by lists1.math.uh.edu with esmtps (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.84) (envelope-from ) id 1ZAqXm-0006cz-DF for ding@lists.math.uh.edu; Thu, 02 Jul 2015 21:17:34 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.84) (envelope-from ) id 1ZAqXl-0002WZ-4E for ding@lists.math.uh.edu; Thu, 02 Jul 2015 21:17:34 -0500 Original-Received: from ebox.rath.org ([23.92.25.96]) by quimby.gnus.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1ZAqXj-00019S-EN for ding@gnus.org; Fri, 03 Jul 2015 04:17:31 +0200 Original-Received: from vostro ([192.168.12.4] helo=vostro.rath.org) by ebox.rath.org with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80) (envelope-from ) id 1ZAqXh-0002IC-6u; Fri, 03 Jul 2015 02:17:29 +0000 Original-Received: by vostro.rath.org (Postfix, from userid 1000) id D0C9FEC44D4; Thu, 2 Jul 2015 19:17:28 -0700 (PDT) Mail-Copies-To: never Mail-Followup-To: ding@gnus.org, 20672@debbugs.gnu.org User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-Spam-Score: -1.7 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:86022 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, This patch introduces a new server variable, nnimap-hide-deleted. If non-nil, articles with the IMAP \Deleted flag will not be included in Summary buffers. This is intended to increase operability with other IMAP mailreaders and the new 'never value for nnimap-expunge (see patch in bug 20670). Changes in v2: * Take into account that server may send the UID, FLAGS and RFC822.SIZE response data items in arbitrary order Changes in v3: * Made first line of docstring a complete sentence. Thanks for considering, -Nikolaus --=20 GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F =C2=BBTime flies like an arrow, fruit flies like a Banana.=C2= =AB --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=nnimap_hide_deleted_v3.diff diff --git a/nnimap.el b/nnimap.el --- a/nnimap.el +++ b/nnimap.el @@ -135,6 +135,11 @@ likely value would be \"text/\" to automatically fetch all textual parts.") +(defvoo nnimap-hide-deleted nil + "Whether to hide deletes messages in summary buffer. +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) @@ -181,7 +186,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]" @@ -240,12 +245,19 @@ (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position) t) (match-string 1))) - (setq lines nil) + (beginning-of-line) + (setq flags + (and (re-search-forward "FLAGS (\\([^)]+\\))" + (line-end-position) + t) + (split-string (match-string 1)))) + (beginning-of-line) (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 @@ -259,20 +271,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. --=-=-=--