--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\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 0E4716DE186E\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:25:11 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.283\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.283 tagged_above=-999 required=5 tests=[AWL=0.287,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
+ 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 KwlUwZnwpGm9 for <notmuch@notmuchmail.org>;\r
+ Sat, 20 Feb 2016 10:25:08 -0800 (PST)\r
+Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com\r
+ [74.125.82.42]) by arlo.cworth.org (Postfix) with ESMTPS id 0C6006DE186C for\r
+ <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:55 -0800 (PST)\r
+Received: by mail-wm0-f42.google.com with SMTP id g62so119129683wme.1\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:54 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=Oa1bBgWhvxxDZGvg9PjJ39rYAjQJGHx+HY3GdEhy1Kk=;\r
+ b=iElZIO6fsUUkFGVa6UQnazdP8ZoPEUUx4M8B6ADEmtnStEQpPG4jNiNhKkH02pxwk0\r
+ JboaAo/WxKFPJUA6xW5NNQmYwf1JKhSncl2hlbVR86qM9XfOSpdQsccLS7aCr3X/7zKl\r
+ CkMu3nTbFwK9YcIIo9oj1ErfolU4k4++axQg0/XFOw6WXrVoWHnqmHpX9/rm2DiBi7Dc\r
+ 8hce/c532ShSBa1KnEOfwgewy93St37wRcYYNJVPiye61Qvtf2Gi3Y9P48p3BziaaUKT\r
+ VkkGgaFXZZzsQBk8xUYsZ8Ff7IWUXo+7xo8MjbkkSiD1RraI0HPoIJD/uYmgZWM2BhCf\r
+ e1jg==\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:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=Oa1bBgWhvxxDZGvg9PjJ39rYAjQJGHx+HY3GdEhy1Kk=;\r
+ b=Wy1WCOKXbpumcCPgbrdjIdp5jzf+bNQxN500bFJEmUlAZMT/x9ah0pAjSSbFRmVqut\r
+ ThQ7nQAlNvQZbWitMh7tMzH6sz4ZVDhOxRMR2+q+mVnOkZ9bsPpJsHDy6HlWg+m16dxE\r
+ dO1QOt8yJAZld/iRVNUtz3K0++QAH91kIQCq8lKt3SSczO2yQpxcwyo++euzi0qwCggn\r
+ n5XeCBmuV2rt5AT/Sj8MYk3SmqQ50a4BdyxYEz9H7IjT9omF3DH4H3kQUKfX//Qs4PB+\r
+ NswKJ2XkcWS4ixtho3ilS9MVI8SQlHCjiLvKlErfjh47pgs3334B1A4QKrg8fm600EyM\r
+ AJoA==\r
+X-Gm-Message-State:\r
+ AG10YOQ2l2kwzUOo3rsIhJwFI8pK4COFGmBaa8AyaXrD13UYW+J0miBdsQ+3G07c+MTT/Q==\r
+X-Received: by 10.28.72.132 with SMTP id v126mr3918786wma.88.1455992693789;\r
+ Sat, 20 Feb 2016 10:24:53 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id 77sm2614777wmp.18.2016.02.20.10.24.52\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 20 Feb 2016 10:24:53 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 4/6] emacs/mua: Generate improved cited text for replies\r
+Date: Sat, 20 Feb 2016 18:24:38 +0000\r
+Message-Id: <1455992680-24978-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\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: Sat, 20 Feb 2016 18:25:11 -0000\r
+\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
+ 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
+ \r
+ (eval-when-compile (require 'cl))\r
+ \r
+-(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
++(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))\r
+ (declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ())\r
+ (declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir))\r
+ \r
+@@ -144,31 +144,6 @@ (defun notmuch-mua-reply-crypto (parts)\r
+ else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+ do (notmuch-mua-reply-crypto (plist-get part :content))))\r
+ \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) "multipart/alternative")\r
+- collect (let* ((subparts (plist-get part :content))\r
+- (types (mapcar (lambda (part) (plist-get part :content-type)) subparts))\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-type)\r
+- return part))\r
+- else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+- append (notmuch-mua-get-quotable-parts (plist-get part :content))\r
+- else if (notmuch-match-content-type (plist-get part :content-type) "text/*")\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 sender reply-all)\r
+ (insert "From: " from "\n")\r
+ (insert "Date: " date "\n\n")\r
+ \r
+- ;; Get the parts of the original message that should be quoted; this includes\r
+- ;; all the text parts, except the non-preferred ones in a multipart/alternative.\r
+- (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))\r
+- (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-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-insert-header-p-never))\r
++ (notmuch-show-insert-body original (plist-get original :body) 0)\r
++ (buffer-substring-no-properties (point-min) (point-max)))))\r
+ \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> writes:\r
+ > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically\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_MAX) 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 = sysconf(_SC_GETPW_R_SIZE_MAX);\r
++> + if (pw_buf_size == -1) pw_buf_size = 64;\r
++> char *pw_buf = 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 = sysconf(_SC_GETPW_R_SIZE_MAX);\r
++> + if (pw_buf_size == -1) pw_buf_size = 64;\r
++> char *pw_buf = talloc_zero_size (ctx, pw_buf_size);\r
++> struct passwd passwd, *ignored;\r
++> char *name;\r
++> -- \r
++> 1.6.5.2\r
++>\r
+ > _______________________________________________\r
+ > notmuch mailing list\r
+ > notmuch@notmuchmail.org\r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff