--- /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 E76D6431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 1 Sep 2013 11:00:01 -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 EapaY46Xdo85 for <notmuch@notmuchmail.org>;\r
+ Sun, 1 Sep 2013 10:59:57 -0700 (PDT)\r
+Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com\r
+ [209.85.215.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 23A89431FBC\r
+ for <notmuch@notmuchmail.org>; Sun, 1 Sep 2013 10:59:57 -0700 (PDT)\r
+Received: by mail-ea0-f182.google.com with SMTP id o10so1934168eaj.27\r
+ for <notmuch@notmuchmail.org>; Sun, 01 Sep 2013 10:59:54 -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;\r
+ bh=o3fPpm1c7gau26V4Wr49v2TqVCsHa+VZ/nxXfHVatr0=;\r
+ b=EaFm1VlSmonEQtvFtWCevkzIqVj3YYsc8Clom5cQGceE76f5WOn8+m1+bnt3yYSnjd\r
+ TQHbZ8az9TSohT1W69W+53CKvCz9fSz3ewUfdCMarjEkvGdG1eJ3ogQOyzSW6DTEl4Nn\r
+ 0diQ77VL7F2GnafvtS8QelEg+Sk7DdhAoIoUVYNJfF6NlkOHlJ9c3kLj32zUbxdHZgsk\r
+ fru1tXdEfUW8cS7gp2ftK1tYVmiVzaNlWyhc61P1Z3IbphWED49GVZumgZQm/aCcM4XE\r
+ f9yWfFMQJ9U620UDBGA1wbKpjmWgH7XeRuJzncLL5bzjs+4xVZmrMioAUKBgDXh9ZlEC\r
+ QDRA==\r
+X-Gm-Message-State:\r
+ ALoCoQmpX7IvdefTdvoxFlbDri014gQdLJ4DL9/KSc3pGxAnLU8fYqmI5OISNyw0XEr68FqKDdK4\r
+X-Received: by 10.15.73.134 with SMTP id h6mr381537eey.76.1378058393274;\r
+ Sun, 01 Sep 2013 10:59:53 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91])\r
+ by mx.google.com with ESMTPSA id h52sm15164776eez.3.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 01 Sep 2013 10:59:52 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: insert quotable parts in reply as they are displayed\r
+ in show view\r
+Date: Sun, 1 Sep 2013 20:59:53 +0300\r
+Message-Id: <1378058393-29590-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.4.rc3\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: Sun, 01 Sep 2013 18:00:02 -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
+We use a temp buffer to not leak text properties from the show\r
+renderer into the reply. This way we also don't need to worry about\r
+narrowing or point placement. Credits to Mark Walters\r
+<markwalters1009@gmail.com> and Austin Clements <amdragon@MIT.EDU> for\r
+getting this part straight.\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
+v3: Incorporate id:87eh98twws.fsf@qmul.ac.uk from Mark\r
+---\r
+ emacs/notmuch-mua.el | 17 +++++++++++------\r
+ emacs/notmuch-show.el | 18 +++++++++++++-----\r
+ 2 files changed, 24 insertions(+), 11 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 2baae5f..ff8149b 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
+@@ -128,12 +130,15 @@ list."\r
+ collect part))\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
+- (goto-char (point-max))))\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
+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.8.4.rc3\r
+\r
projects / notmuch-archives.git / commitdiff