[PATCH v7 3/8] emacs: Allow the indentation of content to be toggled.

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