From: Mark Walters Date: Thu, 25 Oct 2012 08:09:22 +0000 (+0100) Subject: [PATCH (draft) 1/2] emacs: allow the user to toggle the visibility of multipart/alter... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=30d5b3e319aaf9f0fc77ad4872dc3d1af7fedac7;p=notmuch-archives.git [PATCH (draft) 1/2] emacs: allow the user to toggle the visibility of multipart/alternative parts --- diff --git a/bc/eff3737cf786cda6b12f061949aa88934f3027 b/bc/eff3737cf786cda6b12f061949aa88934f3027 new file mode 100644 index 000000000..53328752e --- /dev/null +++ b/bc/eff3737cf786cda6b12f061949aa88934f3027 @@ -0,0 +1,171 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id B8B9D431FAF + for ; Thu, 25 Oct 2012 01:09:35 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.224 +X-Spam-Level: +X-Spam-Status: No, score=0.224 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + HS_INDEX_PARAM=0.023, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id GVWLE-NwvY5R for ; + Thu, 25 Oct 2012 01:09:34 -0700 (PDT) +Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 805AB431FB6 for ; Thu, 25 Oct 2012 01:09:34 -0700 + (PDT) +Received: by mail-wg0-f45.google.com with SMTP id dq12so897880wgb.2 + for ; Thu, 25 Oct 2012 01:09:34 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=h/qeN0c4LCP9QLKd8DlGceDUWyKHZ7WpnaiVtjcMaDg=; + b=XWDgaoOfjGiFZk5lEokPhkNgLGcgDG8lYVg9O5qze93DJEWAMB15zhaAK6ojLF4BX0 + rSkvtB1jpz6vtcSdXKBvkSBqWpeWYZJY17xSGMpN7cq4R9FAUUYKl0BW4GCgZ+ZTP+li + BjdWUd8nv9WxK9+4rjccDjJX/z941M/HC5Aw3GBtoWEOxXf7ba4nZe6Vu4bkpzJjaWvj + 07rR8hQ2gfeXpamlVSQOOWWfmlB1EhJj7k2W+MfHilYzZBzJCKa1KCWwPcDZiblzL7Fr + vKCWHux0EiBAs8lS34Z0U2kstcrkbb61JWtuE47sW0f1mp3InxoD833IOC1o9Sw4jd+F + HsSQ== +Received: by 10.180.82.72 with SMTP id g8mr8438486wiy.20.1351152574147; + Thu, 25 Oct 2012 01:09:34 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPS id b7sm8758781wiz.3.2012.10.25.01.09.32 + (version=TLSv1/SSLv3 cipher=OTHER); + Thu, 25 Oct 2012 01:09:33 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH (draft) 1/2] emacs: allow the user to toggle the visibility of + multipart/alternative parts +Date: Thu, 25 Oct 2012 09:09:22 +0100 +Message-Id: <1351152563-27277-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1351152563-27277-1-git-send-email-markwalters1009@gmail.com> +References: <1351152563-27277-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 25 Oct 2012 08:09:36 -0000 + +This patch adds a keybinding to the buttons in the notmuch-show emacs +buffer to allow the user to toggle the visibility of each part of a +message in the show buffer. This is particularly useful for +multipart/alternative parts where the parts are not really +alternatives but contain different information. +--- + emacs/notmuch-show.el | 47 +++++++++++++++++++++++++++++++++++++++-------- + 1 files changed, 39 insertions(+), 8 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 0f54259..9157669 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -155,6 +155,10 @@ indentation." + (make-variable-buffer-local 'notmuch-show-indent-content) + (put 'notmuch-show-indent-content 'permanent-local t) + ++(defvar notmuch-show-message-multipart/alternative-display-parts nil) ++(make-variable-buffer-local 'notmuch-show-message-multipart/alternative-display-parts) ++(put 'notmuch-show-message-multipart/alternative-display-parts 'permanent-local t) ++ + (defcustom notmuch-show-stash-mlarchive-link-alist + '(("Gmane" . "http://mid.gmane.org/") + ("MARC" . "http://marc.info/?i=") +@@ -455,6 +459,7 @@ message at DEPTH in the current thread." + (define-key map "v" 'notmuch-show-part-button-view) + (define-key map "o" 'notmuch-show-part-button-interactively-view) + (define-key map "|" 'notmuch-show-part-button-pipe) ++ (define-key map "t" 'notmuch-show-part-button-internally-show) + map) + "Submap for button commands") + (fset 'notmuch-show-part-button-map notmuch-show-part-button-map) +@@ -531,6 +536,16 @@ message at DEPTH in the current thread." + (let ((handle (mm-make-handle (current-buffer) (list content-type)))) + (mm-pipe-part handle)))) + ++(defun notmuch-show-internally-show-part (message-id nth &optional filename content-type) ++ "Set a part to be displayed internally" ++ (let ((current-parts (lax-plist-get notmuch-show-message-multipart/alternative-display-parts message-id))) ++ (setq notmuch-show-message-multipart/alternative-display-parts ++ (lax-plist-put notmuch-show-message-multipart/alternative-display-parts message-id ++ (if (memq nth current-parts) ++ (delq nth current-parts) ++ (cons nth current-parts))))) ++ (notmuch-show-refresh-view)) ++ + (defun notmuch-show-multipart/*-to-list (part) + (mapcar (lambda (inner-part) (plist-get inner-part :content-type)) + (plist-get part :content))) +@@ -543,12 +558,15 @@ message at DEPTH in the current thread." + ;; This inserts all parts of the chosen type rather than just one, + ;; but it's not clear that this is the wrong thing to do - which + ;; should be chosen if there are more than one that match? ++ ++ ;; The variable user-parts says which parts should override the ++ ;; default so we use xor (handcoded since lisp does not have it). ++ + (mapc (lambda (inner-part) + (let ((inner-type (plist-get inner-part :content-type))) +- (if (or notmuch-show-all-multipart/alternative-parts +- (string= chosen-type inner-type)) +- (notmuch-show-insert-bodypart msg inner-part depth) +- (notmuch-show-insert-part-header (plist-get inner-part :id) inner-type inner-type nil " (not shown)")))) ++ (notmuch-show-insert-bodypart msg inner-part depth ++ (not (or notmuch-show-all-multipart/alternative-parts ++ (string= chosen-type inner-type)))))) + inner-parts) + + (when notmuch-show-indent-multipart +@@ -806,11 +824,20 @@ message at DEPTH in the current thread." + (setq handlers (cdr handlers)))) + t) + +-(defun notmuch-show-insert-bodypart (msg part depth) +- "Insert the body part PART at depth DEPTH in the current thread." +- (let ((content-type (downcase (plist-get part :content-type))) ++(defun notmuch-show-insert-bodypart (msg part depth &optional not-shown) ++ "Insert the body part PART at depth DEPTH in the current thread. ++ ++If not-shown is TRUE then do not show the part unless the user ++has overridden the default for this part" ++ (let ((user-parts (lax-plist-get notmuch-show-message-multipart/alternative-display-parts ++ (notmuch-id-to-query (plist-get msg :id)))) ++ (content-type (downcase (plist-get part :content-type))) + (nth (plist-get part :id))) +- (notmuch-show-insert-bodypart-internal msg part content-type nth depth content-type)) ++ (when (memq nth user-parts) ++ (setq not-shown (not not-shown))) ++ (if not-shown ++ (notmuch-show-insert-part-header nth content-type content-type nil " (not shown)") ++ (notmuch-show-insert-bodypart-internal msg part content-type nth depth content-type))) + ;; Some of the body part handlers leave point somewhere up in the + ;; part, so we make sure that we're down at the end. + (goto-char (point-max)) +@@ -1895,6 +1922,10 @@ the user (see `notmuch-show-stash-mlarchive-link-alist')." + (interactive) + (notmuch-show-part-button-internal button #'notmuch-show-pipe-part)) + ++(defun notmuch-show-part-button-internally-show (&optional button) ++ (interactive) ++ (notmuch-show-part-button-internal button #'notmuch-show-internally-show-part)) ++ + (defun notmuch-show-part-button-internal (button handler) + (let ((button (or button (button-at (point))))) + (if button +-- +1.7.9.1 +