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 E4BD3431FAF for ; Thu, 26 Jan 2012 00:17:57 -0800 (PST) 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 H-wpUlnol1tI for ; Thu, 26 Jan 2012 00:17:57 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 037E9431FB6 for ; Thu, 26 Jan 2012 00:17:56 -0800 (PST) Received: by wgbdt12 with SMTP id dt12so261044wgb.2 for ; Thu, 26 Jan 2012 00:17:55 -0800 (PST) Received: by 10.180.109.198 with SMTP id hu6mr2336871wib.16.1327565875804; Thu, 26 Jan 2012 00:17:55 -0800 (PST) Received: from hotblack-desiato.hh.sledj.net (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) by mx.google.com with ESMTPS id q7sm4041570wix.5.2012.01.26.00.17.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jan 2012 00:17:54 -0800 (PST) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id 75B759FFA4; Thu, 26 Jan 2012 08:17:52 +0000 (GMT) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH 2/2] emacs: Add more processing of displayed headers. Date: Thu, 26 Jan 2012 08:17:51 +0000 Message-Id: <1327565871-19729-3-git-send-email-dme@dme.org> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1327565871-19729-1-git-send-email-dme@dme.org> References: <1327565871-19729-1-git-send-email-dme@dme.org> 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: Thu, 26 Jan 2012 08:17:58 -0000 Wrap headers to the width of the window and indent continuations. --- emacs/notmuch-show.el | 43 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 7 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index effd2fd..ad286d1 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -67,9 +67,16 @@ any given message." :type 'boolean :group 'notmuch-show) -(defvar notmuch-show-markup-headers-hook '(notmuch-show-colour-headers) +(defcustom notmuch-show-markup-headers-hook '(notmuch-show-colour-headers + notmuch-show-fill-headers + notmuch-show-indent-continuations) "A list of functions called to decorate the headers listed in -`notmuch-message-headers'.") +`notmuch-message-headers'." + :type 'hook + :options '(notmuch-show-colour-headers + notmuch-show-fill-headers + notmuch-show-indent-continuations) + :group 'notmuch-show) (defcustom notmuch-show-hook '(notmuch-show-turn-on-visual-line-mode) "Functions called after populating a `notmuch-show' buffer." @@ -268,13 +275,35 @@ operation on the contents of the current buffer." (overlay-put (make-overlay (point) (re-search-forward ".*$")) 'face face))) -(defun notmuch-show-colour-headers () +(defun notmuch-show-colour-headers (depth) "Apply some colouring to the current headers." (goto-char (point-min)) (while (looking-at "^[A-Za-z][-A-Za-z0-9]*:") (notmuch-show-fontify-header) (forward-line))) +(defun notmuch-show-fill-headers (depth) + "Wrap the text of the current headers." + + ;; '-5' to allow for the indentation code. + (let ((fill-column (- (window-width) depth 5))) + (goto-char (point-min)) + (while (not (eobp)) + (let ((start (point))) + (end-of-line) + ;; We're left at the start of the next line, so there's no need + ;; to move forward after filling. + (fill-region-as-paragraph start (point)))))) + +(defun notmuch-show-indent-continuations (depth) + "Indent any continuation lines." + (goto-char (point-min)) + (while (not (eobp)) + (if (not (looking-at "^[A-Za-z][-A-Za-z0-9]*:")) + ;; Four spaces tends to work well with 'To' and 'Cc' headers. + (insert " ")) + (forward-line))) + (defun notmuch-show-spaces-n (n) "Return a string comprised of `n' spaces." (make-string n ? )) @@ -329,7 +358,7 @@ message at DEPTH in the current thread." "Insert a single header." (insert header ": " header-value "\n")) -(defun notmuch-show-insert-headers (headers) +(defun notmuch-show-insert-headers (headers depth) "Insert the headers of the current message." (let ((start (point))) (mapc (lambda (header) @@ -342,7 +371,7 @@ message at DEPTH in the current thread." (save-excursion (save-restriction (narrow-to-region start (point-max)) - (run-hooks 'notmuch-show-markup-headers-hook))))) + (run-hook-with-args 'notmuch-show-markup-headers-hook depth))))) (define-button-type 'notmuch-show-part-button-type 'action 'notmuch-show-part-button-default @@ -633,7 +662,7 @@ current buffer, if possible." ;; Override `notmuch-message-headers' to force `From' to be ;; displayed. (let ((notmuch-message-headers '("From" "Subject" "To" "Cc" "Date"))) - (notmuch-show-insert-headers (plist-get message :headers))) + (notmuch-show-insert-headers (plist-get message :headers) 0)) ;; Blank line after headers to be compatible with the normal ;; message display. @@ -826,7 +855,7 @@ current buffer, if possible." ;; Set `headers-start' to point after the 'Subject:' header to be ;; compatible with the existing implementation. This just sets it ;; to after the first header. - (notmuch-show-insert-headers headers) + (notmuch-show-insert-headers headers depth) ;; Headers should include a blank line (backwards compatibility). (insert "\n") (save-excursion -- 1.7.8.3