--- /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 olra.theworths.org (Postfix) with ESMTP id 82F3E431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 29 Aug 2013 08:53:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id LdeckeKUBUKE for <notmuch@notmuchmail.org>;\r
+ Thu, 29 Aug 2013 08:53:34 -0700 (PDT)\r
+Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com\r
+ [74.125.83.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ C428D431FBC for <notmuch@notmuchmail.org>; Thu, 29 Aug 2013 08:53:33 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f47.google.com with SMTP id d49so346684eek.34\r
+ for <notmuch@notmuchmail.org>; Thu, 29 Aug 2013 08:53:32 -0700 (PDT)\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=X4Re+1uHWI+JffJ4Ag7r3e3OK8so7mWZxZ9l7MTgitk=;\r
+ b=WTNTecKBTATvQ2jZU4suySveWmePgJJV98GDlWfFgRT9en3K0xVtLl2rhGySIGGhDa\r
+ MqfzZHGaIN2uBBMn3FgSuyKRCw6+g84hCJCw777QRvf865p5VWR/SELKSjS0iXGqc9qV\r
+ MTApJnSDMv08hhQUt/QKLiX/b7FFotSFvG4scss+R2wQbGlz7noMraDBx1v0MZUu5rpm\r
+ bQ+Ih7bOXLYxBPChlKyy/+5+lgQzvA2ETC7yaltFZ0YesQzFMa5Qt+7bv9X1D4mSBIgc\r
+ /h0T4lf9bSbaO/8swy3FyI3cei6iMw6AuP5uWtExVg+ufMh3u+b1iikRWy2U/syxdyIQ\r
+ fvxw==\r
+X-Gm-Message-State:\r
+ ALoCoQkf5//GIwOgurlM2gaquLF8bbye+/mx4XOkTR/eAs0swP+3pmJS65uWSdousfrhdUkTt680\r
+X-Received: by 10.14.205.9 with SMTP id i9mr4318557eeo.72.1377791611353;\r
+ Thu, 29 Aug 2013 08:53:31 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+ r48sm47189968eev.14.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Thu, 29 Aug 2013 08:53:30 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: insert quotable parts in reply as they are\r
+ displayed in show view\r
+Date: Thu, 29 Aug 2013 18:53:31 +0300\r
+Message-Id: <1377791611-29506-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1377633044-22044-1-git-send-email-jani@nikula.org>\r
+References: <1377633044-22044-1-git-send-email-jani@nikula.org>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 29 Aug 2013 15:53:41 -0000\r
+\r
+In reply, insert quotable parts using notmuch-show-insert-bodypart\r
+instead of calling notmuch-mm-display-part-inline directly to render\r
+the quoted parts as they are rendered in show view.\r
+\r
+The notable change is that replies to text/calendar parts quote the\r
+pretty printed output of icalendar-import-buffer rather than the ugly\r
+raw vcalendar.\r
+\r
+---\r
+\r
+v2: use (narrow-to-region (point-min) (point)) in\r
+notmuch-mua-insert-quotable-part instead of adding the ugly recenter\r
+in notmuch-mua-reply. Thanks to Austin and Mark for figuring this out.\r
+---\r
+ emacs/notmuch-mua.el | 12 ++++++++----\r
+ emacs/notmuch-show.el | 18 +++++++++++++-----\r
+ 2 files changed, 21 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 2baae5f..e7cc94e 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -28,6 +28,8 @@\r
+ \r
+ (eval-when-compile (require 'cl))\r
+ \r
++(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
++\r
+ ;;\r
+ \r
+ (defcustom notmuch-mua-send-hook '(notmuch-mua-message-send-hook)\r
+@@ -129,10 +131,12 @@ list."\r
+ \r
+ (defun notmuch-mua-insert-quotable-part (message part)\r
+ (save-restriction\r
+- (narrow-to-region (point) (point))\r
+- (notmuch-mm-display-part-inline message part (plist-get part :id)\r
+- (plist-get part :content-type)\r
+- notmuch-show-process-crypto)\r
++ (narrow-to-region (point-min) (point))\r
++ ;; We don't want hooks, such as notmuch-wash-*, to be run on the\r
++ ;; quotable part.\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
+ (goto-char (point-max))))\r
+ \r
+ ;; There is a bug in emacs 23's message.el that results in a newline\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 2896aae..904b98e 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -844,7 +844,11 @@ message at DEPTH in the current thread."\r
+ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+ "Insert the body part PART at depth DEPTH in the current thread.\r
+ \r
+-If HIDE is non-nil then initially hide this part."\r
++HIDE determines whether to show or hide the part and the button\r
++as follows: If HIDE is nil, show the part and the button. If HIDE\r
++is t, hide the part initially and show the button. If HIDE is\r
++'no-buttons, show the part but do not add any buttons (this is\r
++useful for quoting in replies)."\r
+ \r
+ (let* ((content-type (downcase (plist-get part :content-type)))\r
+ (mime-type (or (and (string= content-type "application/octet-stream")\r
+@@ -854,15 +858,19 @@ If HIDE is non-nil then initially hide this part."\r
+ content-type))\r
+ (nth (plist-get part :id))\r
+ (beg (point))\r
+- ;; We omit the part button for the first (or only) part if this is text/plain.\r
+- (button (unless (and (string= mime-type "text/plain") (<= nth 1))\r
++ ;; Hide the part initially if HIDE is t.\r
++ (show-part (not (equal hide t)))\r
++ ;; We omit the part button for the first (or only) part if\r
++ ;; this is text/plain, or HIDE is 'no-buttons.\r
++ (button (unless (or (equal hide 'no-buttons)\r
++ (and (string= mime-type "text/plain") (<= nth 1)))\r
+ (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))\r
+ (content-beg (point)))\r
+ \r
+ ;; Store the computed mime-type for later use (e.g. by attachment handlers).\r
+ (plist-put part :computed-type mime-type)\r
+ \r
+- (if (not hide)\r
++ (if show-part\r
+ (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button)\r
+ (button-put button :notmuch-lazy-part\r
+ (list msg part mime-type nth depth button)))\r
+@@ -875,7 +883,7 @@ If HIDE is non-nil then initially hide this part."\r
+ (insert "\n"))\r
+ ;; We do not create the overlay for hidden (lazy) parts until\r
+ ;; they are inserted.\r
+- (if (not hide)\r
++ (if show-part\r
+ (notmuch-show-create-part-overlays button content-beg (point))\r
+ (save-excursion\r
+ (notmuch-show-toggle-part-invisibility button)))\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff