From 5e375688418bd35c5b2de71fb69035332ba5aeab Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 9 Jun 2015 10:51:07 +0100 Subject: [PATCH 1/4] emacs: tree: mark read change The mark read code for tree mode did not get updated in the recent changes. This updates it to match. Since the user can customize the mark read logic we just call the show logic in the message pane. --- emacs/notmuch-tree.el | 8 ++++++++ 1 file changed, 8 insertions(+) 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) From a732e8e1a2b511ff16f3ee1bbb5e229ca6a2d8f7 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 27 Jun 2015 14:47:38 +0200 Subject: [PATCH 2/4] NEWS for 0.20.2 Just the one bug fix --- NEWS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS b/NEWS index 845dade4..cc8d7edf 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +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) =========================== From 1c036cca99c4c7cdd649721511cc76b451ef6c98 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 27 Jun 2015 15:04:16 +0200 Subject: [PATCH 3/4] debian: update changelog for 20.2-1 Actual changes are documented in the bug. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) 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 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: From c66e0d4bc2b2152a5d9b1f300fcf5c853bc07cb6 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 27 Jun 2015 15:05:31 +0200 Subject: [PATCH 4/4] version: update to 0.20.2 As usual, bump python version at same time. --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/version b/version index 847e9aef..727d97b9 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.20.1 +0.20.2