--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 198AD6DE155C\r
+ for <notmuch@notmuchmail.org>; Mon, 7 Mar 2016 09:53:20 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.551\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.551 tagged_above=-999 required=5 tests=[AWL=0.169,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id FXB4eeJulrvl for <notmuch@notmuchmail.org>;\r
+ Mon, 7 Mar 2016 09:53:17 -0800 (PST)\r
+Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
+ [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id C26F86DE1410 for\r
+ <notmuch@notmuchmail.org>; Mon, 7 Mar 2016 09:53:16 -0800 (PST)\r
+Received: by mail-wm0-f67.google.com with SMTP id 1so12094337wmg.2\r
+ for <notmuch@notmuchmail.org>; Mon, 07 Mar 2016 09:53:16 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=nikula-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version:content-transfer-encoding;\r
+ bh=NXhpAqP6cDy4pE93MlSLy5iq8gabDOUapeshRQt1Td8=;\r
+ b=kL7t0ESNJ9mbgTmWevr4QcbHdIfEmlyhY+C8rzAwvCSNQp44DZm051GcExe6/I+k8q\r
+ m14Od7bwI7ONZ4ophno020VpHzDyIS3akShD3dzpdhkk5sBJFuvtCBUfXjJnWUnxOjbq\r
+ ysiHZtu7LpfFteU8caDcxCxZw3Jpvf9LgyLlp7Re7QCdi/XGKsbYRUAtrXenmkcxcS2c\r
+ ac6Ozue4T4MBCs3LJazkv23PeKlnabkIMyXwo5oCCEGODl5N31n3uDJvVwhdxNMl7ooz\r
+ jqpCM5p0ZazaD1pWeSGoc+OmSMvvBVkAJ5RdAnh+LlJ08qZXk35DzYL9QeaauepjwzS5\r
+ 8DqQ==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version:content-transfer-encoding;\r
+ bh=NXhpAqP6cDy4pE93MlSLy5iq8gabDOUapeshRQt1Td8=;\r
+ b=LM79nQcubzHV67lOXtHA4iopYVZxxYMOQm89V4h8w3o7vjqSoc9nvuXZCizeckaeXF\r
+ d7JeMoBsVfcSW+kY+tKHLgz6mXEZTVuF4WSD1im5z1PDGVMIH2r4V/x8Z6NBN6P2IOf4\r
+ lDXFnm3ocONxvwyRvCIyjCDxbRIX6oejj1SeSStC5jpL5CBOMx0uVGgpGwxrnxv6wcTh\r
+ JPBD8y5RLTeiINErmGWo4YSdIzb2e1/d0ilL/rcEn4EIn6/kAIk7im77xjv5ptt0Ogl6\r
+ VsWmX+Y/d4zp0y9Pq5oWsDG/xRdMve5abyUidIVU22TL/Iu06vFmCrcX5xqKOW3iCSmF\r
+ pEZw==\r
+X-Gm-Message-State:\r
+ AD7BkJLYA7xlrSlFl7JwsKdv/XNCs0/3Fz+Tdhv+2+Gx+CqOvYoHYbKxtC5/eYKPWGoz/w==\r
+X-Received: by 10.194.238.34 with SMTP id vh2mr28243348wjc.157.1457373195145; \r
+ Mon, 07 Mar 2016 09:53:15 -0800 (PST)\r
+Received: from localhost (mobile-access-bcee39-255.dhcp.inet.fi.\r
+ [188.238.57.255])\r
+ by smtp.gmail.com with ESMTPSA id gb9sm19056028wjb.26.2016.03.07.09.53.14\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 07 Mar 2016 09:53:14 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v6 4/6] emacs/mua: Generate improved cited text for\r
+ replies\r
+In-Reply-To: <1455992680-24978-5-git-send-email-markwalters1009@gmail.com>\r
+References: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+ <1455992680-24978-5-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.21+73~gf8cc320 (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 07 Mar 2016 19:52:11 +0200\r
+Message-ID: <87vb4y5g6s.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 07 Mar 2016 17:53:20 -0000\r
+\r
+On Sat, 20 Feb 2016, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> [ text/plain ]\r
+> From: David Edmondson <dme@dme.org>\r
+>\r
+> Use the message display code to generate message text to cite in\r
+> replies.\r
+>\r
+> For now we set insert-headers-p function to\r
+> notmuch-show-reply-insert-header-p-never so that, as before, we don't\r
+> insert part buttons.\r
+>\r
+> With that choice of insert-headers-p function there is only one\r
+> failing test: this test has a text part (an email message) listed as\r
+> application/octet-stream. Notmuch show displays this part, but the\r
+> reply code omitted it as it had type application/octet-stream. The new\r
+> code correctly includes it. Thus update the expected output to match.\r
+\r
+For a message with mime structure:\r
+\r
+=E2=94=94=E2=94=AC=E2=95=B4multipart/mixed 120338 bytes\r
+ =E2=94=9C=E2=94=80=E2=95=B4text/html 59234 bytes\r
+ =E2=94=94=E2=94=80=E2=95=B4application/octet-stream attachment [filename.h=\r
+tml] 59234 bytes\r
+\r
+this patch (i.e. commit e103f0a971b8 emacs/mua: Generate improved cited\r
+text for replies) causes the application/octet-stream attachment to be\r
+displayed, with:\r
+\r
+[ filename.html: application/octet-stream (as text/html) ]\r
+!!! Bodypart insert error: Internal error: No :content from ("show" "--form=\r
+at=3Dsexp" "--include-html" "--part=3D3" "--decrypt" "id:mid@example.com") =\r
+!!!\r
+\r
+It is anyway followed by what looks like the contents of the attachment\r
+in html, parsed and displayed properly. Running the above command does\r
+not produce any output on the command line.\r
+\r
+Replies now include both text/html and the attachment cited. The cited\r
+text also includes the error message. (To make matters worse, in this\r
+particular case the two parts contain the same information, *sigh*. Not\r
+sure anything can be done about that.)\r
+\r
+Is there a way to interactively choose which parts are cited in replies?\r
+\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+> ---\r
+> emacs/notmuch-mua.el | 43 +++++++++++++------------------------------\r
+> test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++\r
+> 2 files changed, 45 insertions(+), 30 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+> index d4fad7b..ecc5bec 100644\r
+> --- a/emacs/notmuch-mua.el\r
+> +++ b/emacs/notmuch-mua.el\r
+> @@ -28,7 +28,7 @@\r
+>=20=20\r
+> (eval-when-compile (require 'cl))\r
+>=20=20\r
+> -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part =\r
+depth &optional hide))\r
+> +(declare-function notmuch-show-insert-body "notmuch-show" (msg body dept=\r
+h))\r
+> (declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ())\r
+> (declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir))\r
+>=20=20\r
+> @@ -144,31 +144,6 @@ (defun notmuch-mua-reply-crypto (parts)\r
+> else if (notmuch-match-content-type (plist-get part :content-type) "mul=\r
+tipart/*")\r
+> do (notmuch-mua-reply-crypto (plist-get part :content))))\r
+>=20=20\r
+> -(defun notmuch-mua-get-quotable-parts (parts)\r
+> - (loop for part in parts\r
+> - if (notmuch-match-content-type (plist-get part :content-type) "multipar=\r
+t/alternative")\r
+> - collect (let* ((subparts (plist-get part :content))\r
+> - (types (mapcar (lambda (part) (plist-get part :content-type)) subpart=\r
+s))\r
+> - (chosen-type (car (notmuch-multipart/alternative-choose types))))\r
+> - (loop for part in (reverse subparts)\r
+> - if (notmuch-match-content-type (plist-get part :content-type) chosen=\r
+-type)\r
+> - return part))\r
+> - else if (notmuch-match-content-type (plist-get part :content-type) "mul=\r
+tipart/*")\r
+> - append (notmuch-mua-get-quotable-parts (plist-get part :content))\r
+> - else if (notmuch-match-content-type (plist-get part :content-type) "tex=\r
+t/*")\r
+> - collect part))\r
+> -\r
+> -(defun notmuch-mua-insert-quotable-part (message part)\r
+> - ;; We don't want text properties leaking from the show renderer into\r
+> - ;; the reply so we use a temp buffer. Also we don't want hooks, such\r
+> - ;; as notmuch-wash-*, to be run on the quotable part so we set\r
+> - ;; notmuch-show-insert-text/plain-hook to nil.\r
+> - (insert (with-temp-buffer\r
+> - (let ((notmuch-show-insert-text/plain-hook nil))\r
+> - ;; Show the part but do not add buttons.\r
+> - (notmuch-show-insert-bodypart message part 0 'no-buttons))\r
+> - (buffer-substring-no-properties (point-min) (point-max)))))\r
+> -\r
+> ;; There is a bug in emacs 23's message.el that results in a newline\r
+> ;; not being inserted after the References header, so the next header\r
+> ;; is concatenated to the end of it. This function fixes the problem,\r
+> @@ -247,10 +222,18 @@ (defun notmuch-mua-reply (query-string &optional se=\r
+nder reply-all)\r
+> (insert "From: " from "\n")\r
+> (insert "Date: " date "\n\n")\r
+>=20=20\r
+> - ;; Get the parts of the original message that should be quoted; this in=\r
+cludes\r
+> - ;; all the text parts, except the non-preferred ones in a multipart/alt=\r
+ernative.\r
+> - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get origin=\r
+al :body))))\r
+> - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) qu=\r
+otable-parts))\r
+> + (insert (with-temp-buffer\r
+> + (let\r
+> + ;; Don't attempt to clean up messages, excerpt\r
+> + ;; citations, etc. in the original message before\r
+> + ;; quoting.\r
+> + ((notmuch-show-insert-text/plain-hook nil)\r
+> + ;; Don't omit long parts.\r
+> + (notmuch-show-max-text-part-size 0)\r
+> + ;; Insert headers for parts as appropriate for replying.\r
+> + (notmuch-show-insert-header-p-function #'notmuch-show-reply-ins=\r
+ert-header-p-never))\r
+> + (notmuch-show-insert-body original (plist-get original :body) 0)\r
+> + (buffer-substring-no-properties (point-min) (point-max)))))\r
+>=20=20\r
+> (set-mark (point))\r
+> (goto-char start)\r
+> diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+> index 61bc369..22ca71c 100755\r
+> --- a/test/T310-emacs.sh\r
+> +++ b/test/T310-emacs.sh\r
+> @@ -473,6 +473,38 @@ Alex Botero-Lowry <alex.boterolowry@gmail.com> write=\r
+s:\r
+> > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.html=\r
+specifically\r
+> > uses 64 as the\r
+> > buffer size.\r
+> +> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001\r
+> +> From: Alexander Botero-Lowry <alex.boterolowry@gmail.com>\r
+> +> Date: Tue, 17 Nov 2009 11:30:39 -0800\r
+> +> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MA=\r
+X) returns -1\r
+> +>\r
+> +> ---\r
+> +> notmuch-config.c | 2 ++\r
+> +> 1 files changed, 2 insertions(+), 0 deletions(-)\r
+> +>\r
+> +> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> +> index 248149c..e7220d8 100644\r
+> +> --- a/notmuch-config.c\r
+> +> +++ b/notmuch-config.c\r
+> +> @@ -77,6 +77,7 @@ static char *\r
+> +> get_name_from_passwd_file (void *ctx)\r
+> +> {\r
+> +> long pw_buf_size =3D sysconf(_SC_GETPW_R_SIZE_MAX);\r
+> +> + if (pw_buf_size =3D=3D -1) pw_buf_size =3D 64;\r
+> +> char *pw_buf =3D talloc_zero_size (ctx, pw_buf_size);\r
+> +> struct passwd passwd, *ignored;\r
+> +> char *name;\r
+> +> @@ -101,6 +102,7 @@ static char *\r
+> +> get_username_from_passwd_file (void *ctx)\r
+> +> {\r
+> +> long pw_buf_size =3D sysconf(_SC_GETPW_R_SIZE_MAX);\r
+> +> + if (pw_buf_size =3D=3D -1) pw_buf_size =3D 64;\r
+> +> char *pw_buf =3D talloc_zero_size (ctx, pw_buf_size);\r
+> +> struct passwd passwd, *ignored;\r
+> +> char *name;\r
+> +> --=20\r
+> +> 1.6.5.2\r
+> +>\r
+> > _______________________________________________\r
+> > notmuch mailing list\r
+> > notmuch@notmuchmail.org\r
+> --=20\r
+> 2.1.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> https://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff