Merge tag '0.20.2'

notmuch 0.20.2 release

Conflicts:
	NEWS

5 files changed, 24 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 004b8677..e474e53e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,13 @@ Library
 
 The use of absolute paths is now enforced when calling notmuch_database_{open, create}
 
+Notmuch 0.20.2 (2015-06-27)
+===========================
+
+Emacs Interface
+---------------
+
+Bug fix for marking messages read in `notmuch-tree` mode.
 
 Notmuch 0.20.1 (2015-06-01)
 ===========================
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index aa6fe210..1295ac5a 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.20.1'
+__VERSION__ = '0.20.2'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index f338ddfb..3c030d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.20.2-1) unstable; urgency=medium
+
+  * Bug fix: "notmuch-tree does not mark messages as read", thanks to
+    Raúl Benencia (Closes: #789693).
+
+ -- David Bremner <bremner@debian.org>  Sat, 27 Jun 2015 15:03:33 +0200
+
 notmuch (0.20.1-1) unstable; urgency=medium
 
   * Bug fix: "FTBFS on arm64", thanks to Edmund Grimley Evans (Closes:
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 8b6cd510..182235e7 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -413,6 +413,13 @@ Does NOT change the database."
       (ignore-errors
 	(delete-window notmuch-tree-message-window)))))
 
+(defun notmuch-tree-command-hook ()
+  (when (eq major-mode 'notmuch-tree-mode)
+    ;; We just run the notmuch-show-command-hook on the message pane.
+    (when (buffer-live-p notmuch-tree-message-buffer)
+      (with-current-buffer notmuch-tree-message-buffer
+	(notmuch-show-command-hook)))))
+
 (defun notmuch-tree-show-message-in ()
   "Show the current message (in split-pane)."
   (interactive)
@@ -855,6 +862,7 @@ This is is a helper function for notmuch-tree. The arguments are
 the same as for the function notmuch-tree."
   (interactive)
   (notmuch-tree-mode)
+  (add-hook 'post-command-hook #'notmuch-tree-command-hook t t)
   (setq notmuch-tree-basic-query basic-query)
   (setq notmuch-tree-query-context query-context)
   (setq notmuch-tree-target-msg target)
diff --git a/version b/version
index 847e9aef..727d97b9 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.20.1
+0.20.2