Merge branch 'release'

Conflicts:
	notmuch-reply.c
	notmuch.1

diff --combined emacs/notmuch-show.el
index 5502efd159c575ae54b509a7414318cc1cba323e,82d11c925bab4b5ecc6b225579e430514b8fce44..2806879e53cfff412e07c4b175478f8ed728998e
--- 1/emacs/notmuch-show.el
--- 2/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@@ -75,10 -75,7 +75,10 @@@ any given message.
    :group 'notmuch
    :type 'hook)
  
 -(defcustom notmuch-show-insert-text/plain-hook '(notmuch-wash-excerpt-citations)
 +(defcustom notmuch-show-insert-text/plain-hook '(notmuch-wash-wrap-long-lines
 +                                               notmuch-wash-tidy-citations
 +                                               notmuch-wash-elide-blank-lines
 +                                               notmuch-wash-excerpt-citations)
    "Functions used to improve the display of text/plain parts."
    :group 'notmuch
    :type 'hook
@@@ -94,7 -91,7 +94,7 @@@
    :group 'notmuch
    :type 'boolean)
  
- (defcustom notmuch-indent-messages-width 1
+ (defcustom notmuch-show-indent-messages-width 1
    "Width of message indentation in threads.
  
  Messages are shown indented according to their depth in a thread.
@@@ -251,7 -248,7 +251,7 @@@ unchanged ADDRESS if parsing fails.
    "Insert a notmuch style headerline based on HEADERS for a
  message at DEPTH in the current thread."
    (let ((start (point)))
-     (insert (notmuch-show-spaces-n (* notmuch-indent-messages-width depth))
+     (insert (notmuch-show-spaces-n (* notmuch-show-indent-messages-width depth))
            (notmuch-show-clean-address (plist-get headers :From))
            " ("
            date
@@@ -588,10 -585,6 +588,10 @@@ current buffer, if possible.
                nil))
          nil))))
  
 +;; Handler for wash generated inline patch fake parts.
 +(defun notmuch-show-insert-part-inline-patch-fake-part (msg part content-type nth depth declared-type)
 +  (notmuch-show-insert-part-*/* msg part "text/x-diff" nth depth "inline patch"))
 +
  (defun notmuch-show-insert-part-*/* (msg part content-type nth depth declared-type)
    ;; This handler _must_ succeed - it is the handler of last resort.
    (notmuch-show-insert-part-header nth content-type declared-type (plist-get part :filename))
@@@ -746,7 -739,7 +746,7 @@@
      (setq content-end (point-marker))
  
      ;; Indent according to the depth in the thread.
-     (indent-rigidly content-start content-end (* notmuch-indent-messages-width depth))
+     (indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth))
  
      (setq message-end (point-max-marker))
  

diff --combined test/emacs
index a06c22384a430fcf5ed452f9fcd6f4a57b1618ff,f36718e73e450728f51e26c08f9e8a46e2be1646..ac47b161f837be4f325101c8305ab499867e376f
--- 1/test/emacs
--- 2/test/emacs
+++ b/test/emacs
@@@ -52,21 -52,21 +52,21 @@@ test_expect_equal_file OUTPUT $EXPECTED
  
  test_begin_subtest "Basic notmuch-show view in emacs default indentation"
  maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
- test_emacs "(let ((notmuch-indent-messages-width 1))
+ test_emacs "(let ((notmuch-show-indent-messages-width 1))
              (notmuch-show \"$maildir_storage_thread\")
              (test-output))"
  test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
  
  test_begin_subtest "Basic notmuch-show view in emacs without indentation"
  maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
- test_emacs "(let ((notmuch-indent-messages-width 0))
+ test_emacs "(let ((notmuch-show-indent-messages-width 0))
              (notmuch-show \"$maildir_storage_thread\")
              (test-output))"
  test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-without-indentation
  
  test_begin_subtest "Basic notmuch-show view in emacs with fourfold indentation"
  maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
- test_emacs "(let ((notmuch-indent-messages-width 4))
+ test_emacs "(let ((notmuch-show-indent-messages-width 4))
              (notmuch-show \"$maildir_storage_thread\")
              (test-output))"
  test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation
@@@ -81,7 -81,7 +81,7 @@@ cat <<EOF >EXPECTE
  "Invalid " From" <test_suite@notmuchmail.org> (2001-01-05) (inbox)
  Subject: message-with-invalid-from
  To: Notmuch Test Suite <test_suite@notmuchmail.org>
 -Date: Tue, 05 Jan 2001 15:43:57 -0000
 +Date: Fri, 05 Jan 2001 15:43:57 +0000
  
  This is just a test message (#1)
  EOF
@@@ -320,7 -320,7 +320,7 @@@ add_message '[from]="Top Poster <top@po
  ----- Original Message -----
  From: Notmuch Test Suite <test_suite@notmuchmail.org>
  To: Notmuch Test Suite <test_suite@notmuchmai.org>
 -Sent: Tue, 05 Jan 2001 15:43:57 -0000
 +Sent: Fri, 05 Jan 2001 15:43:57 +0000
  Subject: The problem with top-posting
  
  Q: Why is top-posting such a bad thing?
@@@ -331,7 -331,7 +331,7 @@@ test_emacs "(notmuch-show \"top-posting
  echo "Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (inbox)
  Subject: The problem with top-posting
  To: Notmuch Test Suite <test_suite@notmuchmail.org>
 -Date: Tue, 05 Jan 2001 15:43:57 -0000
 +Date: Fri, 05 Jan 2001 15:43:57 +0000
  
  A: Because it messes up the order in which people normally read text.
  Q: Why is top-posting such a bad thing?
@@@ -340,7 -340,7 +340,7 @@@ Q: What is the most annoying thing in e
  Top Poster <top@poster.com> (2001-01-05) (inbox unread)
  Subject: Re: The problem with top-posting
  To: Notmuch Test Suite <test_suite@notmuchmail.org>
 -Date: Tue, 05 Jan 2001 15:43:57 -0000
 +Date: Fri, 05 Jan 2001 15:43:57 +0000
  
  Thanks for the advice! I will be sure to put it to good use.