From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 0DC6F431FD7 for ; Tue, 27 Aug 2013 12:50:53 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MxXRRtpDy0HN for ; Tue, 27 Aug 2013 12:50:45 -0700 (PDT) Received: from mail-ea0-f175.google.com (mail-ea0-f175.google.com [209.85.215.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 535FB431FD6 for ; Tue, 27 Aug 2013 12:50:45 -0700 (PDT) Received: by mail-ea0-f175.google.com with SMTP id m14so2494443eaj.34 for ; Tue, 27 Aug 2013 12:50:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WjMRj0pWVG0gQQlHymVw/oSv6o9/qOsruuVaZuswOv8=; b=ovFL+ewFjOV1w8N0izGk9AVvWkfxqxUK/w5FIVeXJCSA9vRrbferKNThLPTPbw93MX s0TqbbJV3bn5y5boCDSfTyB94L2uJgQVxLdmge63F55GHj3o2DcuvhLGoFkGzCSzQZI2 KYjRDl3wcDxN4STJQXkYmjPNq9ZAZzV14nyJ2qugRD03mp/aB1tralyMZv4/zqn6VPhS uAbxRuecHl6VXj/aT5sXFa+CwNvHlOOIZX5hslQEMZGlAdy+cyCPrYZtfnYh+KwXIG2T kYeDgAgSlBstnPSTev7E9i/OopvTXTdww98nXpKdx2vsQjy6pM5nneVMNUG0RhaC4J7Z BpRQ== X-Gm-Message-State: ALoCoQnOksbA2Vj+oCCSWxHtM4Y/fGyg0ceMlF9nXiRYYhJKARsiAo4LlH27pNsMy0IMbnm6pdd0 X-Received: by 10.15.99.72 with SMTP id bk48mr37318155eeb.22.1377633042770; Tue, 27 Aug 2013 12:50:42 -0700 (PDT) Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi. [88.195.111.91]) by mx.google.com with ESMTPSA id f49sm31586567eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 27 Aug 2013 12:50:41 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v2] emacs: insert quotable parts in reply as they are displayed in show view Date: Tue, 27 Aug 2013 22:50:44 +0300 Message-Id: <1377633044-22044-1-git-send-email-jani@nikula.org> X-Mailer: git-send-email 1.7.10.4 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Tue, 27 Aug 2013 19:50:53 -0000 In reply, insert quotable parts using notmuch-show-insert-bodypart instead of calling notmuch-mm-display-part-inline directly to render the quoted parts as they are rendered in show view. The notable change is that replies to text/calendar parts quote the pretty printed output of icalendar-import-buffer rather than the ugly raw vcalendar. --- emacs/notmuch-mua.el | 13 ++++++++++--- emacs/notmuch-show.el | 18 +++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 2baae5f..c3aca80 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -28,6 +28,8 @@ (eval-when-compile (require 'cl)) +(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide)) + ;; (defcustom notmuch-mua-send-hook '(notmuch-mua-message-send-hook) @@ -130,9 +132,11 @@ list." (defun notmuch-mua-insert-quotable-part (message part) (save-restriction (narrow-to-region (point) (point)) - (notmuch-mm-display-part-inline message part (plist-get part :id) - (plist-get part :content-type) - notmuch-show-process-crypto) + ;; We don't want hooks, such as notmuch-wash-*, to be run on the + ;; quotable part. + (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)) (goto-char (point-max)))) ;; There is a bug in emacs 23's message.el that results in a newline @@ -219,6 +223,9 @@ list." (goto-char (point-max)) (push-mark) (message-goto-body) + + ;; Display message from the beginning if possible. + (recenter (- (line-number-at-pos) 1)) (set-buffer-modified-p nil)) (defun notmuch-mua-forward-message () diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 2896aae..904b98e 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -844,7 +844,11 @@ message at DEPTH in the current thread." (defun notmuch-show-insert-bodypart (msg part depth &optional hide) "Insert the body part PART at depth DEPTH in the current thread. -If HIDE is non-nil then initially hide this part." +HIDE determines whether to show or hide the part and the button +as follows: If HIDE is nil, show the part and the button. If HIDE +is t, hide the part initially and show the button. If HIDE is +'no-buttons, show the part but do not add any buttons (this is +useful for quoting in replies)." (let* ((content-type (downcase (plist-get part :content-type))) (mime-type (or (and (string= content-type "application/octet-stream") @@ -854,15 +858,19 @@ If HIDE is non-nil then initially hide this part." content-type)) (nth (plist-get part :id)) (beg (point)) - ;; We omit the part button for the first (or only) part if this is text/plain. - (button (unless (and (string= mime-type "text/plain") (<= nth 1)) + ;; Hide the part initially if HIDE is t. + (show-part (not (equal hide t))) + ;; We omit the part button for the first (or only) part if + ;; this is text/plain, or HIDE is 'no-buttons. + (button (unless (or (equal hide 'no-buttons) + (and (string= mime-type "text/plain") (<= nth 1))) (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename)))) (content-beg (point))) ;; Store the computed mime-type for later use (e.g. by attachment handlers). (plist-put part :computed-type mime-type) - (if (not hide) + (if show-part (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button) (button-put button :notmuch-lazy-part (list msg part mime-type nth depth button))) @@ -875,7 +883,7 @@ If HIDE is non-nil then initially hide this part." (insert "\n")) ;; We do not create the overlay for hidden (lazy) parts until ;; they are inserted. - (if (not hide) + (if show-part (notmuch-show-create-part-overlays button content-beg (point)) (save-excursion (notmuch-show-toggle-part-invisibility button))) -- 1.7.10.4