From: Mark Walters Date: Sat, 1 Jun 2013 08:15:44 +0000 (+0100) Subject: [PATCH v4 2/5] emacs: show: move the insertion of the header button to the top level X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8eaf394cfd45ce4b33e484469ac60c21bf8e924a;p=notmuch-archives.git [PATCH v4 2/5] emacs: show: move the insertion of the header button to the top level --- diff --git a/0e/22e60c1d3d0d3f981fc93389a7e9f0f9c513a5 b/0e/22e60c1d3d0d3f981fc93389a7e9f0f9c513a5 new file mode 100644 index 000000000..88f78038e --- /dev/null +++ b/0e/22e60c1d3d0d3f981fc93389a7e9f0f9c513a5 @@ -0,0 +1,296 @@ +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 2628E429E54 + for ; Sat, 1 Jun 2013 01:16:30 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 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, + 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 9fMz3tpkv9nB for ; + Sat, 1 Jun 2013 01:16:24 -0700 (PDT) +Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com + [209.85.212.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id F27EB429E3F + for ; Sat, 1 Jun 2013 01:16:20 -0700 (PDT) +Received: by mail-wi0-f175.google.com with SMTP id hn14so1322408wib.8 + for ; Sat, 01 Jun 2013 01:16:18 -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=yjiuOss1Wa60HfCUem6Cbc9Vv972od92Qo2Xb74tRVA=; + b=o8wnOa2qyjSqOVyAqEBsYi0HmVcLori0yyyh2bmu+wOt4H0e/jirRWgkcZHfGyYA38 + WG6ao+LoQY3o/O5yqDDlsfGMigvcdS1DY5gina08TxPiESQ3qwchJ3GO3j7f84Vk7S0D + ZZ9MBYkSbV3g6hS+SxDnfBgRBt1jpjvtOfKoH/DWcvY7AS/2vDAjB7VTzpK1hSaOk5iT + m5isUV2P50g4N//3vs10J4Hb7eZFjhw7xMRlC081diVD3Kak+W3V0lKXhOH57S37hlX2 + ZAUFb8cwwuUV9MYAgqZhrSqZ4P2w4qoEQ2OY1GEmTm8XePLOcN/92US9tzKy/voreEjM + GVLQ== +X-Received: by 10.180.74.81 with SMTP id r17mr6170018wiv.49.1370074578465; + Sat, 01 Jun 2013 01:16:18 -0700 (PDT) +Received: from localhost (94.197.247.227.threembb.co.uk. [94.197.247.227]) + by mx.google.com with ESMTPSA id fx7sm8560790wic.11.2013.06.01.01.16.15 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 01 Jun 2013 01:16:17 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, Austin Clements , + Adam Wolfe Gordon +Subject: [PATCH v4 2/5] emacs: show: move the insertion of the header button + to the top level +Date: Sat, 1 Jun 2013 09:15:44 +0100 +Message-Id: <1370074547-24677-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1370074547-24677-1-git-send-email-markwalters1009@gmail.com> +References: <1370074547-24677-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: Sat, 01 Jun 2013 08:16:30 -0000 + +Previously each of the part insertion handlers inserted the part +button themselves. Move this up into +notmuch-show-insert-bodypart. Since a small number of the handlers +modify the button (the encryption/signature ones) we need to pass the +header button as an argument into the individual part insertion +handlers. However, the declared-type argument was only used for the +text for the part buttons we can now omit it. + +The patch is large but mostly simple. The only things of note are that +we let the text/plain handler applies notmuch-wash to the whole part +including the part button. In particular, notmuch-wash removes leading +blank lines from a text/plain part, but since the button is counted as +part of the part this does not happen with text/plain buttons that +have a button. This is probably a bug in notmuch-wash but changing it +does make several tests fail (that rely on this blank line) so, for +the moment, keep the old behaviour. +--- + emacs/notmuch-show.el | 97 ++++++++++++++++++++++++------------------------- + 1 file changed, 47 insertions(+), 50 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index dda5c10..9e119e8 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -514,8 +514,7 @@ message at DEPTH in the current thread." + (mapcar (lambda (inner-part) (plist-get inner-part :content-type)) + (plist-get part :content))) + +-(defun notmuch-show-insert-part-multipart/alternative (msg part content-type nth depth declared-type) +- (notmuch-show-insert-part-header nth declared-type content-type nil) ++(defun notmuch-show-insert-part-multipart/alternative (msg part content-type nth depth button) + (let ((chosen-type (car (notmuch-multipart/alternative-choose (notmuch-show-multipart/*-to-list part)))) + (inner-parts (plist-get part :content)) + (start (point))) +@@ -592,8 +591,7 @@ message at DEPTH in the current thread." + content-type) + nil))) + +-(defun notmuch-show-insert-part-multipart/related (msg part content-type nth depth declared-type) +- (notmuch-show-insert-part-header nth declared-type content-type nil) ++(defun notmuch-show-insert-part-multipart/related (msg part content-type nth depth button) + (let ((inner-parts (plist-get part :content)) + (start (point))) + +@@ -612,16 +610,15 @@ message at DEPTH in the current thread." + (indent-rigidly start (point) 1))) + t) + +-(defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth declared-type) +- (let ((button (notmuch-show-insert-part-header nth declared-type content-type nil))) +- (button-put button 'face 'notmuch-crypto-part-header) +- ;; add signature status button if sigstatus provided +- (if (plist-member part :sigstatus) +- (let* ((from (notmuch-show-get-header :From msg)) +- (sigstatus (car (plist-get part :sigstatus)))) +- (notmuch-crypto-insert-sigstatus-button sigstatus from)) +- ;; if we're not adding sigstatus, tell the user how they can get it +- (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))) ++(defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth button) ++ (button-put button 'face 'notmuch-crypto-part-header) ++ ;; add signature status button if sigstatus provided ++ (if (plist-member part :sigstatus) ++ (let* ((from (notmuch-show-get-header :From msg)) ++ (sigstatus (car (plist-get part :sigstatus)))) ++ (notmuch-crypto-insert-sigstatus-button sigstatus from)) ++ ;; if we're not adding sigstatus, tell the user how they can get it ++ (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")) + + (let ((inner-parts (plist-get part :content)) + (start (point))) +@@ -634,20 +631,19 @@ message at DEPTH in the current thread." + (indent-rigidly start (point) 1))) + t) + +-(defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth declared-type) +- (let ((button (notmuch-show-insert-part-header nth declared-type content-type nil))) +- (button-put button 'face 'notmuch-crypto-part-header) +- ;; add encryption status button if encstatus specified +- (if (plist-member part :encstatus) +- (let ((encstatus (car (plist-get part :encstatus)))) +- (notmuch-crypto-insert-encstatus-button encstatus) +- ;; add signature status button if sigstatus specified +- (if (plist-member part :sigstatus) +- (let* ((from (notmuch-show-get-header :From msg)) +- (sigstatus (car (plist-get part :sigstatus)))) +- (notmuch-crypto-insert-sigstatus-button sigstatus from)))) +- ;; if we're not adding encstatus, tell the user how they can get it +- (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))) ++(defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth button) ++ (button-put button 'face 'notmuch-crypto-part-header) ++ ;; add encryption status button if encstatus specified ++ (if (plist-member part :encstatus) ++ (let ((encstatus (car (plist-get part :encstatus)))) ++ (notmuch-crypto-insert-encstatus-button encstatus) ++ ;; add signature status button if sigstatus specified ++ (if (plist-member part :sigstatus) ++ (let* ((from (notmuch-show-get-header :From msg)) ++ (sigstatus (car (plist-get part :sigstatus)))) ++ (notmuch-crypto-insert-sigstatus-button sigstatus from)))) ++ ;; if we're not adding encstatus, tell the user how they can get it ++ (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")) + + (let ((inner-parts (plist-get part :content)) + (start (point))) +@@ -660,8 +656,7 @@ message at DEPTH in the current thread." + (indent-rigidly start (point) 1))) + t) + +-(defun notmuch-show-insert-part-multipart/* (msg part content-type nth depth declared-type) +- (notmuch-show-insert-part-header nth declared-type content-type nil) ++(defun notmuch-show-insert-part-multipart/* (msg part content-type nth depth button) + (let ((inner-parts (plist-get part :content)) + (start (point))) + ;; Show all of the parts. +@@ -673,8 +668,7 @@ message at DEPTH in the current thread." + (indent-rigidly start (point) 1))) + t) + +-(defun notmuch-show-insert-part-message/rfc822 (msg part content-type nth depth declared-type) +- (notmuch-show-insert-part-header nth declared-type content-type nil) ++(defun notmuch-show-insert-part-message/rfc822 (msg part content-type nth depth button) + (let* ((message (car (plist-get part :content))) + (body (car (plist-get message :body))) + (start (point))) +@@ -695,12 +689,13 @@ message at DEPTH in the current thread." + (indent-rigidly start (point) 1))) + t) + +-(defun notmuch-show-insert-part-text/plain (msg part content-type nth depth declared-type) +- (let ((start (point))) +- ;; If this text/plain part is not the first part in the message, +- ;; insert a header to make this clear. +- (if (> nth 1) +- (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename))) ++(defun notmuch-show-insert-part-text/plain (msg part content-type nth depth button) ++ ;; For backward compatibility we want to apply the text/plain hook ++ ;; to the whole of the part including the part button if there is ++ ;; one. ++ (let ((start (if button ++ (button-start button) ++ (point)))) + (insert (notmuch-get-bodypart-content msg part nth notmuch-show-process-crypto)) + (save-excursion + (save-restriction +@@ -708,8 +703,7 @@ message at DEPTH in the current thread." + (run-hook-with-args 'notmuch-show-insert-text/plain-hook msg depth)))) + t) + +-(defun notmuch-show-insert-part-text/calendar (msg part content-type nth depth declared-type) +- (notmuch-show-insert-part-header nth declared-type content-type (plist-get part :filename)) ++(defun notmuch-show-insert-part-text/calendar (msg part content-type nth depth button) + (insert (with-temp-buffer + (insert (notmuch-get-bodypart-content msg part nth notmuch-show-process-crypto)) + ;; notmuch-get-bodypart-content provides "raw", non-converted +@@ -732,8 +726,8 @@ message at DEPTH in the current thread." + t) + + ;; For backwards compatibility. +-(defun notmuch-show-insert-part-text/x-vcalendar (msg part content-type nth depth declared-type) +- (notmuch-show-insert-part-text/calendar msg part content-type nth depth declared-type)) ++(defun notmuch-show-insert-part-text/x-vcalendar (msg part content-type nth depth button) ++ (notmuch-show-insert-part-text/calendar msg part content-type nth depth button)) + + (defun notmuch-show-get-mime-type-of-application/octet-stream (part) + ;; If we can deduce a MIME type from the filename of the attachment, +@@ -751,7 +745,7 @@ message at DEPTH in the current thread." + nil)) + nil)))) + +-(defun notmuch-show-insert-part-text/html (msg part content-type nth depth declared-type) ++(defun notmuch-show-insert-part-text/html (msg part content-type nth depth button) + ;; text/html handler to work around bugs in renderers and our + ;; invisibile parts code. In particular w3m sets up a keymap which + ;; "leaks" outside the invisible region and causes strange effects +@@ -759,11 +753,10 @@ message at DEPTH in the current thread." + ;; tell w3m not to set a keymap (so the normal notmuch-show-mode-map + ;; remains). + (let ((mm-inline-text-html-with-w3m-keymap nil)) +- (notmuch-show-insert-part-*/* msg part content-type nth depth declared-type))) ++ (notmuch-show-insert-part-*/* msg part content-type nth depth button))) + +-(defun notmuch-show-insert-part-*/* (msg part content-type nth depth declared-type) ++(defun notmuch-show-insert-part-*/* (msg part content-type nth depth button) + ;; This handler _must_ succeed - it is the handler of last resort. +- (notmuch-show-insert-part-header nth content-type declared-type (plist-get part :filename)) + (notmuch-mm-display-part-inline msg part nth content-type notmuch-show-process-crypto) + t) + +@@ -786,13 +779,13 @@ message at DEPTH in the current thread." + + ;; + + +-(defun notmuch-show-insert-bodypart-internal (msg part content-type nth depth declared-type) ++(defun notmuch-show-insert-bodypart-internal (msg part content-type nth depth button) + (let ((handlers (notmuch-show-handlers-for content-type))) + ;; Run the content handlers until one of them returns a non-nil + ;; value. + (while (and handlers + (not (condition-case err +- (funcall (car handlers) msg part content-type nth depth declared-type) ++ (funcall (car handlers) msg part content-type nth depth button) + (error (progn + (insert "!!! Bodypart insert error: ") + (insert (error-message-string err)) +@@ -820,6 +813,7 @@ message at DEPTH in the current thread." + "Insert the body part PART at depth DEPTH in the current thread. + + If HIDE is non-nil then initially hide this part." ++ + (let* ((content-type (downcase (plist-get part :content-type))) + (mime-type (or (and (string= content-type "application/octet-stream") + (notmuch-show-get-mime-type-of-application/octet-stream part)) +@@ -827,9 +821,12 @@ If HIDE is non-nil then initially hide this part." + "text/x-diff") + content-type)) + (nth (plist-get part :id)) +- (beg (point))) ++ (beg (point)) ++ ;; We omit the part button for the first (or only) part if this is text/plain. ++ (button (unless (and (string= mime-type "text/plain") (<= nth 1)) ++ (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))) + +- (notmuch-show-insert-bodypart-internal msg part mime-type nth depth content-type) ++ (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button) + ;; 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)) +-- +1.7.10.4 +