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 DA88C431FD4 for ; Mon, 6 Feb 2012 01:21:33 -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 EyiwJkmhphwa for ; Mon, 6 Feb 2012 01:21:32 -0800 (PST) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id BF8FD431FB6 for ; Mon, 6 Feb 2012 01:21:30 -0800 (PST) Received: by wibhi8 with SMTP id hi8so4643235wib.26 for ; Mon, 06 Feb 2012 01:21:29 -0800 (PST) Received: by 10.180.100.234 with SMTP id fb10mr25977021wib.8.1328520089495; Mon, 06 Feb 2012 01:21:29 -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 q2sm23987295wiy.7.2012.02.06.01.21.25 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Feb 2012 01:21:26 -0800 (PST) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id 25E4DA0E82; Mon, 6 Feb 2012 09:21:24 +0000 (GMT) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH v7 3/8] emacs: Allow the indentation of content to be toggled. Date: Mon, 6 Feb 2012 09:21:17 +0000 Message-Id: <1328520082-26659-4-git-send-email-dme@dme.org> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1328520082-26659-1-git-send-email-dme@dme.org> References: <1327486729-18052-1-git-send-email-dme@dme.org> <1328520082-26659-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: Mon, 06 Feb 2012 09:21:34 -0000 Very deeply indented content is sometimes difficult to read (particular for something like patches). Allow the indentation of the content to be toggled with '<'. Indentation of the header lines is not affected, so it remains possible to see the structure of the thread. --- emacs/notmuch-show.el | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 39f19d3..89663ee 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -145,6 +145,10 @@ indentation." (make-variable-buffer-local 'notmuch-show-elide-non-matching-messages) (put 'notmuch-show-elide-non-matching-messages 'permanent-local t) +(defvar notmuch-show-indent-content t) +(make-variable-buffer-local 'notmuch-show-indent-content) +(put 'notmuch-show-indent-content 'permanent-local t) + (defmacro with-current-notmuch-show-message (&rest body) "Evaluate body with current buffer set to the text of current message" `(save-excursion @@ -255,10 +259,12 @@ operation on the contents of the current buffer." (all (buffer-substring (notmuch-show-message-top) (notmuch-show-message-bottom))) - (props (notmuch-show-get-message-properties))) + (props (notmuch-show-get-message-properties)) + (indenting notmuch-show-indent-content)) (with-temp-buffer (insert all) - (indent-rigidly (point-min) (point-max) (- depth)) + (if indenting + (indent-rigidly (point-min) (point-max) (- depth))) ;; Remove the original header. (goto-char (point-min)) (re-search-forward "^$" (point-max) nil) @@ -896,7 +902,8 @@ current buffer, if possible." (setq body-start (point-marker)) ;; A blank line between the headers and the body. (insert "\n") - (notmuch-show-insert-body msg (plist-get msg :body) depth) + (notmuch-show-insert-body msg (plist-get msg :body) + (if notmuch-show-indent-content depth 0)) ;; Ensure that the body ends with a newline. (unless (bolp) (insert "\n")) @@ -904,7 +911,8 @@ current buffer, if possible." (setq content-end (point-marker)) ;; Indent according to the depth in the thread. - (indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth)) + (if notmuch-show-indent-content + (indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth))) (setq message-end (point-max-marker)) @@ -951,6 +959,15 @@ current buffer, if possible." "Showing all messages.")) (notmuch-show-refresh-view)) +(defun notmuch-show-toggle-thread-indentation () + "Toggle the indentation of threads." + (interactive) + (setq notmuch-show-indent-content (not notmuch-show-indent-content)) + (message (if notmuch-show-indent-content + "Content is indented." + "Content is not indented.")) + (notmuch-show-refresh-view)) + (defun notmuch-show-insert-tree (tree depth) "Insert the message tree TREE at depth DEPTH in the current thread." (let ((msg (car tree)) @@ -1113,6 +1130,7 @@ Refreshes the current view, observing changes in cryptographic preferences." (define-key map "#" 'notmuch-show-print-message) (define-key map "!" 'notmuch-show-toggle-elide-non-matching) (define-key map "$" 'notmuch-show-toggle-process-crypto) + (define-key map "<" 'notmuch-show-toggle-thread-indentation) map) "Keymap for \"notmuch show\" buffers.") (fset 'notmuch-show-mode-map notmuch-show-mode-map) -- 1.7.8.3