From e4d8879c2b0cb1c55714f63c90e3b2c962da4ff4 Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Wed, 1 Feb 2012 14:39:21 +0000 Subject: [PATCH] [PATCH v5 3/6] emacs: Allow the indentation of content to be toggled. --- e9/898271b2187bd121cfee6c7b96a254930bae85 | 142 ++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 e9/898271b2187bd121cfee6c7b96a254930bae85 diff --git a/e9/898271b2187bd121cfee6c7b96a254930bae85 b/e9/898271b2187bd121cfee6c7b96a254930bae85 new file mode 100644 index 000000000..3c8ccf482 --- /dev/null +++ b/e9/898271b2187bd121cfee6c7b96a254930bae85 @@ -0,0 +1,142 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id BF42241EC06 + for ; Wed, 1 Feb 2012 06:39:31 -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 PyOiCn1wshiI for ; + Wed, 1 Feb 2012 06:39:30 -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 + 84E19429E34 for ; Wed, 1 Feb 2012 06:39:30 -0800 + (PST) +Received: by wgbdt12 with SMTP id dt12so1197490wgb.2 + for ; Wed, 01 Feb 2012 06:39:29 -0800 (PST) +Received: by 10.180.107.68 with SMTP id ha4mr16489123wib.9.1328107169321; + Wed, 01 Feb 2012 06:39: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 q2sm33350389wiy.7.2012.02.01.06.39.27 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 01 Feb 2012 06:39:28 -0800 (PST) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 392BDA0502; Wed, 1 Feb 2012 14:39:26 +0000 (GMT) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v5 3/6] emacs: Allow the indentation of content to be toggled. +Date: Wed, 1 Feb 2012 14:39:21 +0000 +Message-Id: <1328107164-10520-4-git-send-email-dme@dme.org> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1328107164-10520-1-git-send-email-dme@dme.org> +References: <1327486729-18052-1-git-send-email-dme@dme.org> + <1328107164-10520-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: Wed, 01 Feb 2012 14:39:32 -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 df81cd1..a07a44a 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) +@@ -886,7 +892,8 @@ current buffer, if possible." + (setq notmuch-show-previous-subject bare-subject) + + (setq body-start (point-marker)) +- (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")) +@@ -894,7 +901,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)) + +@@ -941,6 +949,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)) +@@ -1103,6 +1120,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 + -- 2.26.2