From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 0E4716DE186E for ; Sat, 20 Feb 2016 10:25:11 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.283 X-Spam-Level: X-Spam-Status: No, score=-0.283 tagged_above=-999 required=5 tests=[AWL=0.287, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KwlUwZnwpGm9 for ; Sat, 20 Feb 2016 10:25:08 -0800 (PST) Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by arlo.cworth.org (Postfix) with ESMTPS id 0C6006DE186C for ; Sat, 20 Feb 2016 10:24:55 -0800 (PST) Received: by mail-wm0-f42.google.com with SMTP id g62so119129683wme.1 for ; Sat, 20 Feb 2016 10:24:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Oa1bBgWhvxxDZGvg9PjJ39rYAjQJGHx+HY3GdEhy1Kk=; b=iElZIO6fsUUkFGVa6UQnazdP8ZoPEUUx4M8B6ADEmtnStEQpPG4jNiNhKkH02pxwk0 JboaAo/WxKFPJUA6xW5NNQmYwf1JKhSncl2hlbVR86qM9XfOSpdQsccLS7aCr3X/7zKl CkMu3nTbFwK9YcIIo9oj1ErfolU4k4++axQg0/XFOw6WXrVoWHnqmHpX9/rm2DiBi7Dc 8hce/c532ShSBa1KnEOfwgewy93St37wRcYYNJVPiye61Qvtf2Gi3Y9P48p3BziaaUKT VkkGgaFXZZzsQBk8xUYsZ8Ff7IWUXo+7xo8MjbkkSiD1RraI0HPoIJD/uYmgZWM2BhCf e1jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Oa1bBgWhvxxDZGvg9PjJ39rYAjQJGHx+HY3GdEhy1Kk=; b=Wy1WCOKXbpumcCPgbrdjIdp5jzf+bNQxN500bFJEmUlAZMT/x9ah0pAjSSbFRmVqut ThQ7nQAlNvQZbWitMh7tMzH6sz4ZVDhOxRMR2+q+mVnOkZ9bsPpJsHDy6HlWg+m16dxE dO1QOt8yJAZld/iRVNUtz3K0++QAH91kIQCq8lKt3SSczO2yQpxcwyo++euzi0qwCggn n5XeCBmuV2rt5AT/Sj8MYk3SmqQ50a4BdyxYEz9H7IjT9omF3DH4H3kQUKfX//Qs4PB+ NswKJ2XkcWS4ixtho3ilS9MVI8SQlHCjiLvKlErfjh47pgs3334B1A4QKrg8fm600EyM AJoA== X-Gm-Message-State: AG10YOQ2l2kwzUOo3rsIhJwFI8pK4COFGmBaa8AyaXrD13UYW+J0miBdsQ+3G07c+MTT/Q== X-Received: by 10.28.72.132 with SMTP id v126mr3918786wma.88.1455992693789; Sat, 20 Feb 2016 10:24:53 -0800 (PST) Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) by smtp.gmail.com with ESMTPSA id 77sm2614777wmp.18.2016.02.20.10.24.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Feb 2016 10:24:53 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH v6 4/6] emacs/mua: Generate improved cited text for replies Date: Sat, 20 Feb 2016 18:24:38 +0000 Message-Id: <1455992680-24978-5-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com> References: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.20 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, 20 Feb 2016 18:25:11 -0000 From: David Edmondson Use the message display code to generate message text to cite in replies. For now we set insert-headers-p function to notmuch-show-reply-insert-header-p-never so that, as before, we don't insert part buttons. With that choice of insert-headers-p function there is only one failing test: this test has a text part (an email message) listed as application/octet-stream. Notmuch show displays this part, but the reply code omitted it as it had type application/octet-stream. The new code correctly includes it. Thus update the expected output to match. --- emacs/notmuch-mua.el | 43 +++++++++++++------------------------------ test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index d4fad7b..ecc5bec 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -28,7 +28,7 @@ (eval-when-compile (require 'cl)) -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide)) +(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth)) (declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ()) (declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir)) @@ -144,31 +144,6 @@ (defun notmuch-mua-reply-crypto (parts) else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*") do (notmuch-mua-reply-crypto (plist-get part :content)))) -(defun notmuch-mua-get-quotable-parts (parts) - (loop for part in parts - if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative") - collect (let* ((subparts (plist-get part :content)) - (types (mapcar (lambda (part) (plist-get part :content-type)) subparts)) - (chosen-type (car (notmuch-multipart/alternative-choose types)))) - (loop for part in (reverse subparts) - if (notmuch-match-content-type (plist-get part :content-type) chosen-type) - return part)) - else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*") - append (notmuch-mua-get-quotable-parts (plist-get part :content)) - else if (notmuch-match-content-type (plist-get part :content-type) "text/*") - collect part)) - -(defun notmuch-mua-insert-quotable-part (message part) - ;; We don't want text properties leaking from the show renderer into - ;; the reply so we use a temp buffer. Also we don't want hooks, such - ;; as notmuch-wash-*, to be run on the quotable part so we set - ;; notmuch-show-insert-text/plain-hook to nil. - (insert (with-temp-buffer - (let ((notmuch-show-insert-text/plain-hook nil)) - ;; Show the part but do not add buttons. - (notmuch-show-insert-bodypart message part 0 'no-buttons)) - (buffer-substring-no-properties (point-min) (point-max))))) - ;; There is a bug in emacs 23's message.el that results in a newline ;; not being inserted after the References header, so the next header ;; is concatenated to the end of it. This function fixes the problem, @@ -247,10 +222,18 @@ (defun notmuch-mua-reply (query-string &optional sender reply-all) (insert "From: " from "\n") (insert "Date: " date "\n\n") - ;; Get the parts of the original message that should be quoted; this includes - ;; all the text parts, except the non-preferred ones in a multipart/alternative. - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body)))) - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts)) + (insert (with-temp-buffer + (let + ;; Don't attempt to clean up messages, excerpt + ;; citations, etc. in the original message before + ;; quoting. + ((notmuch-show-insert-text/plain-hook nil) + ;; Don't omit long parts. + (notmuch-show-max-text-part-size 0) + ;; Insert headers for parts as appropriate for replying. + (notmuch-show-insert-header-p-function #'notmuch-show-reply-insert-header-p-never)) + (notmuch-show-insert-body original (plist-get original :body) 0) + (buffer-substring-no-properties (point-min) (point-max))))) (set-mark (point)) (goto-char start) diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index 61bc369..22ca71c 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -473,6 +473,38 @@ Alex Botero-Lowry writes: > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically > uses 64 as the > buffer size. +> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001 +> From: Alexander Botero-Lowry +> Date: Tue, 17 Nov 2009 11:30:39 -0800 +> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 +> +> --- +> notmuch-config.c | 2 ++ +> 1 files changed, 2 insertions(+), 0 deletions(-) +> +> diff --git a/notmuch-config.c b/notmuch-config.c +> index 248149c..e7220d8 100644 +> --- a/notmuch-config.c +> +++ b/notmuch-config.c +> @@ -77,6 +77,7 @@ static char * +> get_name_from_passwd_file (void *ctx) +> { +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); +> + if (pw_buf_size == -1) pw_buf_size = 64; +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); +> struct passwd passwd, *ignored; +> char *name; +> @@ -101,6 +102,7 @@ static char * +> get_username_from_passwd_file (void *ctx) +> { +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); +> + if (pw_buf_size == -1) pw_buf_size = 64; +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); +> struct passwd passwd, *ignored; +> char *name; +> -- +> 1.6.5.2 +> > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org -- 2.1.4