From d34720e7b35da771d9a06ee8dbdc158680684e99 Mon Sep 17 00:00:00 2001 From: Lars Kotthoff Date: Fri, 22 Dec 2023 14:06:34 -0700 Subject: [PATCH 01/16] config: allow custom separators in author lists Allow distinguishing between commas separating authors and separating first and last names. Amended by db: reformat NEWS entry and commit message. Tweaked whitespace in lib/thread.cc. --- NEWS | 11 +++++++++++ doc/man1/notmuch-config.rst | 13 +++++++++++++ lib/config.cc | 8 ++++++++ lib/notmuch.h | 2 ++ lib/thread.cc | 19 ++++++++++++++----- test/T030-config.sh | 2 ++ test/T055-path-config.sh | 4 ++++ test/T206-author-separator.sh | 26 ++++++++++++++++++++++++++ test/T590-libconfig.sh | 10 ++++++++++ 9 files changed, 90 insertions(+), 5 deletions(-) create mode 100755 test/T206-author-separator.sh diff --git a/NEWS b/NEWS index cf8107f2..8c0ab15b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +Notmuch 0.39 (UNRELEASED) +========================= + +General +------- + +Allow to customize the separator between individual and matched and +non-matched authors when showing threads. See +`search.authors_separator` and `search.authors_matched_separator` in +notmuch-config(1). + Notmuch 0.38.3 (2024-03-09) =========================== diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst index bd34afa4..5106655f 100644 --- a/doc/man1/notmuch-config.rst +++ b/doc/man1/notmuch-config.rst @@ -273,6 +273,19 @@ paths are presumed relative to `$HOME` for items in section Default: empty list. Note that :any:`notmuch-setup(1)` puts ``deleted;spam`` here when creating new configuration file. +.. nmconfig:: search.authors_separator + + The string to separate authors when showing a thread. + + Default: , + +.. nmconfig:: search.authors_matched_separator + + The string to separate matched from non-matched authors when showing a + thread. + + Default: | + .. nmconfig:: show.extra_headers By default :any:`notmuch-show(1)` includes the following headers diff --git a/lib/config.cc b/lib/config.cc index 6cd15fab..acb397ec 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -608,6 +608,10 @@ _notmuch_config_key_to_string (notmuch_config_key_t key) return "database.autocommit"; case NOTMUCH_CONFIG_EXTRA_HEADERS: return "show.extra_headers"; + case NOTMUCH_CONFIG_AUTHORS_SEPARATOR: + return "search.authors_separator"; + case NOTMUCH_CONFIG_AUTHORS_MATCHED_SEPARATOR: + return "search.authors_matched_separator"; case NOTMUCH_CONFIG_INDEX_AS_TEXT: return "index.as_text"; default: @@ -658,6 +662,10 @@ _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key) return ""; case NOTMUCH_CONFIG_AUTOCOMMIT: return "8000"; + case NOTMUCH_CONFIG_AUTHORS_SEPARATOR: + return ", "; + case NOTMUCH_CONFIG_AUTHORS_MATCHED_SEPARATOR: + return "| "; case NOTMUCH_CONFIG_EXTRA_HEADERS: case NOTMUCH_CONFIG_HOOK_DIR: case NOTMUCH_CONFIG_BACKUP_DIR: diff --git a/lib/notmuch.h b/lib/notmuch.h index 4e2b0fa4..937fa24e 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -2565,6 +2565,8 @@ typedef enum { NOTMUCH_CONFIG_AUTOCOMMIT, NOTMUCH_CONFIG_EXTRA_HEADERS, NOTMUCH_CONFIG_INDEX_AS_TEXT, + NOTMUCH_CONFIG_AUTHORS_SEPARATOR, + NOTMUCH_CONFIG_AUTHORS_MATCHED_SEPARATOR, NOTMUCH_CONFIG_LAST } notmuch_config_key_t; diff --git a/lib/thread.cc b/lib/thread.cc index 60e9a666..168a9e8b 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -122,21 +122,28 @@ _thread_add_matched_author (notmuch_thread_t *thread, /* Construct an authors string from matched_authors_array and * authors_array. The string contains matched authors first, then - * non-matched authors (with the two groups separated by '|'). Within - * each group, authors are listed in date order. */ + * non-matched authors (with the two groups separated by '|' or the custom + * separator defined in the configuration). Within each group, authors are + * listed in date order and separated by ',' or the custom separator defined in + * the configuration. */ static void _resolve_thread_authors_string (notmuch_thread_t *thread) { unsigned int i; char *author; int first_non_matched_author = 1; + const char *authors_sep = notmuch_config_get (thread->notmuch, + NOTMUCH_CONFIG_AUTHORS_SEPARATOR); + const char *authors_matched_sep = notmuch_config_get (thread->notmuch, + NOTMUCH_CONFIG_AUTHORS_MATCHED_SEPARATOR); /* First, list all matched authors in date order. */ for (i = 0; i < thread->matched_authors_array->len; i++) { author = (char *) g_ptr_array_index (thread->matched_authors_array, i); if (thread->authors) - thread->authors = talloc_asprintf (thread, "%s, %s", + thread->authors = talloc_asprintf (thread, "%s%s%s", thread->authors, + authors_sep, author); else thread->authors = author; @@ -149,12 +156,14 @@ _resolve_thread_authors_string (notmuch_thread_t *thread) author, NULL, NULL)) continue; if (first_non_matched_author) { - thread->authors = talloc_asprintf (thread, "%s| %s", + thread->authors = talloc_asprintf (thread, "%s%s%s", thread->authors, + authors_matched_sep, author); } else { - thread->authors = talloc_asprintf (thread, "%s, %s", + thread->authors = talloc_asprintf (thread, "%s%s%s", thread->authors, + authors_sep, author); } diff --git a/test/T030-config.sh b/test/T030-config.sh index 621e0b69..1d2b7df8 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -63,6 +63,8 @@ index.as_text= maildir.synchronize_flags=true new.ignore= new.tags=unread;inbox +search.authors_matched_separator=| +search.authors_separator=, search.exclude_tags= user.name=Notmuch Test Suite user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index 1feb5624..049b745e 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -303,6 +303,8 @@ index.as_text= maildir.synchronize_flags=true new.ignore= new.tags=unread;inbox +search.authors_matched_separator=| +search.authors_separator=, search.exclude_tags= user.name=Notmuch Test Suite user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org @@ -325,6 +327,8 @@ database.mail_root database.path maildir.synchronize_flags new.tags +search.authors_matched_separator +search.authors_separator user.name user.other_email user.primary_email diff --git a/test/T206-author-separator.sh b/test/T206-author-separator.sh new file mode 100755 index 00000000..b8b1afb4 --- /dev/null +++ b/test/T206-author-separator.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +test_description="custom separator for authors" +. $(dirname "$0")/test-lib.sh || exit 1 + +test_begin_subtest "Adding parent message" +generate_message [body]=findme [id]=new-parent-id [subject]=author-reorder-threadtest '[from]="User "' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' +output=$(NOTMUCH_NEW) +test_expect_equal "$output" "Added 1 new message to the database." + +test_begin_subtest "Adding initial child message" +generate_message [body]=findme "[in-reply-to]=\" [subject]=author-reorder-threadtest '[from]="last name, first name "' '[date]="Sat, 01 Jan 2000 12:01:00 -0000"' +output=$(NOTMUCH_NEW) +test_expect_equal "$output" "Added 1 new message to the database." + +test_begin_subtest "Adding second child message" +generate_message [body]=findme "[in-reply-to]=\" [subject]=author-reorder-threadtest '[from]="first last "' '[date]="Sat, 01 Jan 2000 12:02:00 -0000"' +output=$(NOTMUCH_NEW) +test_expect_equal "$output" "Added 1 new message to the database." + +test_begin_subtest "Custom separarator is used" +notmuch config set search.authors_matched_separator "#" +notmuch config set search.authors_separator ";" +output=$(notmuch search from:user | notmuch_search_sanitize) +test_expect_equal "$output" "thread:XXX 2000-01-01 [1/3] User#last name, first name;first last; author-reorder-threadtest (inbox unread)" + +test_done diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index 9326ba3e..9b364895 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -441,6 +441,8 @@ cat <<'EOF' >EXPECTED 11: '8000' 12: 'NULL' 13: '' +14: ', ' +15: '| ' == stderr == EOF unset MAILDIR @@ -725,6 +727,8 @@ test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "list by keys (ndlc)" notmuch config set search.exclude_tags "foo;bar;fub" +notmuch config set search.authors_matched_separator "| " +notmuch config set search.authors_separator ", " notmuch config set new.ignore "sekrit_junk" notmuch config set index.as_text "text/" cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL% @@ -754,6 +758,8 @@ cat <<'EOF' >EXPECTED 11: '8000' 12: 'NULL' 13: 'text/' +14: ', ' +15: '| ' == stderr == EOF test_expect_equal_file EXPECTED OUTPUT @@ -789,6 +795,8 @@ cat <<'EOF' >EXPECTED 11: '8000' 12: 'NULL' 13: '' +14: ', ' +15: '| ' == stderr == EOF test_expect_equal_file EXPECTED OUTPUT.clean @@ -865,6 +873,8 @@ key with spaces value, with, spaces! maildir.synchronize_flags true new.ignore sekrit_junk new.tags unread;inbox +search.authors_matched_separator | +search.authors_separator , search.exclude_tags foo;bar;fub show.extra_headers (null) test.key1 testvalue1 -- 2.45.2 From 0aac2ae67e41bc88a359b619402ef2803b4dd0ac Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 3 Aug 2024 14:56:06 -0400 Subject: [PATCH 02/16] Convert notmuch-vim to Vim addon policy 2.0 The new Vim addon policy relies on Vim's native package functionality, rather than the Debian-specific vim-addons tool. This allows the addon to be immediately available when the package is installed, rather than requiring extra setup by the user. * Install notmuch-vim to its own /usr/share/notmuch-vim directory, so the files are self-contained. * Remove vim-addon-manager from notmuch-vim Depends * Add ${vim-addon:Depends} to notmuch-vim Depends to ensure it has the required relationships on Vim/Neovim. * Build-Depend on dh-sequence-vim-addon to automatically setup the required symlinks for Vim and Neovim to see the addon. Signed-off-by: James McCoy --- debian/control | 3 ++- debian/notmuch-vim.dirs | 4 ---- debian/notmuch-vim.install | 5 +---- debian/notmuch-vim.neovim-addon | 1 + debian/notmuch-vim.vim-addon | 1 + debian/rules | 1 + 6 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 debian/notmuch-vim.dirs create mode 120000 debian/notmuch-vim.neovim-addon create mode 100644 debian/notmuch-vim.vim-addon diff --git a/debian/control b/debian/control index 4fded909..77096b85 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), dh-elpa (>= 1.3), dh-python, + dh-sequence-vim-addon, desktop-file-utils, doxygen, dpkg-dev (>= 1.17.14), @@ -211,9 +212,9 @@ Replaces: Depends: notmuch, ruby-notmuch, - vim-addon-manager, vim-ruby, ${misc:Depends}, + ${vim-addon:Depends}, Recommends: ruby-mail, Description: thread-based email index, search and tagging (vim interface) diff --git a/debian/notmuch-vim.dirs b/debian/notmuch-vim.dirs deleted file mode 100644 index 2b531314..00000000 --- a/debian/notmuch-vim.dirs +++ /dev/null @@ -1,4 +0,0 @@ -usr/share/vim/addons/doc -usr/share/vim/addons/plugin -usr/share/vim/addons/syntax -usr/share/vim/registry diff --git a/debian/notmuch-vim.install b/debian/notmuch-vim.install index cf898738..08096d37 100644 --- a/debian/notmuch-vim.install +++ b/debian/notmuch-vim.install @@ -1,4 +1 @@ -vim/notmuch.txt usr/share/vim/addons/doc -vim/notmuch.vim usr/share/vim/addons/plugin -vim/notmuch.yaml usr/share/vim/registry -vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax +/usr/share/notmuch-vim diff --git a/debian/notmuch-vim.neovim-addon b/debian/notmuch-vim.neovim-addon new file mode 120000 index 00000000..a576db7c --- /dev/null +++ b/debian/notmuch-vim.neovim-addon @@ -0,0 +1 @@ +notmuch-vim.vim-addon \ No newline at end of file diff --git a/debian/notmuch-vim.vim-addon b/debian/notmuch-vim.vim-addon new file mode 100644 index 00000000..9c23ba18 --- /dev/null +++ b/debian/notmuch-vim.vim-addon @@ -0,0 +1 @@ +/usr/share/notmuch-vim notmuch diff --git a/debian/rules b/debian/rules index a77ffa15..ecf09abc 100755 --- a/debian/rules +++ b/debian/rules @@ -37,4 +37,5 @@ override_dh_auto_install: PYBUILD_NAME=notmuch dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python PYBUILD_NAME=notmuch2 dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python-cffi $(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C vim prefix=/usr/share/notmuch-vim DESTDIR=$(CURDIR)/debian/tmp install dh_auto_install --sourcedirectory bindings/ruby -- 2.45.2 From 551e1ed6880263ed3693159ed04aaa45213a338b Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 3 Aug 2024 14:56:07 -0400 Subject: [PATCH 03/16] Add changelog entry for James McCoy's work --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a2ef9b70..4843006c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.38.3-3) UNRELEASED; urgency=medium + + [ James McCoy ] + * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936). + + -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 + notmuch (0.38.3-2) unstable; urgency=medium * No change upload to rebuild with dh-elpa 2.1.5 -- 2.45.2 From fd539928c46b253b3a4e1759d1f5f3bbb2ac84e9 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 3 Aug 2024 14:56:08 -0400 Subject: [PATCH 04/16] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add related Enhances (Closes: #1029190). --- debian/changelog | 3 +++ debian/control | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4843006c..385d4776 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium [ James McCoy ] * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936). + [ Nicholas D Steeves ] + * Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add + related Enhances (Closes: #1029190). -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 77096b85..d07cedea 100644 --- a/debian/control +++ b/debian/control @@ -236,9 +236,10 @@ Depends: ${misc:Depends}, ${perl:Depends}, Recommends: - mutt, + mutt | neomutt, Enhances: mutt, + neomutt, notmuch, Description: thread-based email index, search and tagging (Mutt interface) notmuch-mutt provides integration among the Mutt mail user agent and -- 2.45.2 From a39747c38a49db84d184c7e6c8504ff172088f51 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 3 Aug 2024 14:56:09 -0400 Subject: [PATCH 05/16] Add Astroid as an alternative Recommends; this one is a GUI client that may be less intimidating for new users. --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 385d4776..9974209a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium [ Nicholas D Steeves ] * Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add related Enhances (Closes: #1029190). + * Add Astroid as an alternative Recommends; this one is a GUI client that + may be less intimidating for new users. + -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index d07cedea..b3547dff 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, Recommends: - elpa-notmuch | notmuch-vim | notmuch-mutt | alot, + elpa-notmuch | notmuch-vim | notmuch-mutt | alot | astroid, gpg-agent, gpgsm, Suggests: -- 2.45.2 From d42e9bc3c924b8ae41c921f7a5445b25bb5dd57b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 5 Aug 2024 07:03:07 -0300 Subject: [PATCH 06/16] debian: drop build conflicts on gdb-minimal Recent gdb Provides gdb-minimal, so we can't conflict with it and require gdb. This may cause problems for people building in dirty environments for older gdb, but there is not much we can do. --- debian/changelog | 6 +++++- debian/control | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9974209a..6d605fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,11 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium * Add Astroid as an alternative Recommends; this one is a GUI client that may be less intimidating for new users. - -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 + [ David Bremner ] + * remove "Build-Conflicts: gdb-minimal", thanks to Jeremy Bícha (Closes: + #1077911). + + -- David Bremner Mon, 05 Aug 2024 07:02:47 -0300 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index b3547dff..4dc525c1 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Uploaders: David Bremner , Build-Conflicts: gdb [ia64 mips mips64el hppa], - gdb-minimal, ruby1.8, Build-Depends: dpkg-dev (>= 1.22.5), bash-completion (>=1.9.0~), -- 2.45.2 From a7052376d3cbac52f726a3615a3201bac9a086c2 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 5 Aug 2024 08:48:24 -0300 Subject: [PATCH 07/16] debian: skip T810-tsan everywhere Not sure whose fault the failure is, but for now skip the test. --- debian/changelog | 6 ++++-- debian/rules | 4 +--- debian/tests/control | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d605fbe..1bd26a1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -notmuch (0.38.3-3) UNRELEASED; urgency=medium +notmuch (0.38.3-3) unstable; urgency=medium [ James McCoy ] * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936). @@ -12,8 +12,10 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium [ David Bremner ] * remove "Build-Conflicts: gdb-minimal", thanks to Jeremy Bícha (Closes: #1077911). + * skip test T810-tsan everywhere, as it seems broken by the latest glib + (Closes: #1077910). Thanks to Jeremy Bícha for the report - -- David Bremner Mon, 05 Aug 2024 07:02:47 -0300 + -- David Bremner Mon, 05 Aug 2024 08:48:01 -0300 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index ecf09abc..41f70298 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,7 @@ #!/usr/bin/make -f include /usr/share/dpkg/architecture.mk -ifeq ($(DEB_HOST_ARCH),ppc64el) - export NOTMUCH_SKIP_TESTS = T810-tsan -endif +export NOTMUCH_SKIP_TESTS = T810-tsan export DEB_BUILD_MAINT_OPTIONS = hardening=+all diff --git a/debian/tests/control b/debian/tests/control index 80be1deb..11aebad9 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,7 +1,7 @@ Test-command: env NOTMUCH_TEST_INSTALLED=1 TERM=dumb NOTMUCH_HAVE_MAN=1 NOTMUCH_HAVE_SFSEXP=1 NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK=1 NOTMUCH_HAVE_PYTHON3_CFFI=1 NOTMUCH_HAVE_PYTHON3_PYTEST=1 - NOTMUCH_HAVE_ASAN=1 NOTMUCH_HAVE_TSAN=1 + NOTMUCH_HAVE_ASAN=1 NOTMUCH_HAVE_TSAN=1 NOTMUCH_SKIP_TESTS=T810-tsan ./test/notmuch-test Restrictions: allow-stderr Architecture: amd64, arm64 -- 2.45.2 From 85c1dbded05dc182b131e5ad798e5956dc6eb359 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 5 Aug 2024 10:14:40 -0300 Subject: [PATCH 08/16] debian: migrate build dependency to pkgconf pkgconf is apparently the annointed successor to pkg-config, at least in Debian. --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1bd26a1e..3a792518 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,9 @@ notmuch (0.38.3-3) unstable; urgency=medium #1077911). * skip test T810-tsan everywhere, as it seems broken by the latest glib (Closes: #1077910). Thanks to Jeremy Bícha for the report + * Replace build-dependency on pkg-config with pkgconf - -- David Bremner Mon, 05 Aug 2024 08:48:01 -0300 + -- David Bremner Mon, 05 Aug 2024 10:13:01 -0300 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 4dc525c1..08e3c7f3 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), libtalloc-dev, libxapian-dev, libz-dev, - pkg-config, + pkgconf, python3, python3-cffi, python3-pytest, -- 2.45.2 From a8ba7c59a40e84da6f0e07782c4472bf26a409ea Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 29 Jul 2024 08:04:44 -0300 Subject: [PATCH 09/16] devel: document emacs keybindings u and U Thanks to changing the column widths to accomodate longer function names, the diff is rather large, but the content is two new rows for 'u' and 'U' --- devel/emacs-keybindings.org | 121 ++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/devel/emacs-keybindings.org b/devel/emacs-keybindings.org index 218677c2..d8b443e6 100644 --- a/devel/emacs-keybindings.org +++ b/devel/emacs-keybindings.org @@ -1,60 +1,61 @@ -|--------------+----------------------------------------+-------------------------------------------------------+-----------------------------------------| -| Key | Search Mode | Show Mode | Tree Mode | -|--------------+----------------------------------------+-------------------------------------------------------+-----------------------------------------| -| a | notmuch-search-archive-thread | notmuch-show-archive-message-then-next-or-next-thread | notmuch-tree-archive-message-then-next | -| b | notmuch-search-scroll-down | notmuch-show-resend-message | notmuch-show-resend-message | -| c | notmuch-search-stash-map | notmuch-show-stash-map | notmuch-show-stash-map | -| d | | | | -| e | | | (notmuch-tree-button-activate) | -| f | | notmuch-show-forward-message | notmuch-show-forward-message | -| g | | | | -| h | | notmuch-show-toggle-visibility-headers | | -| i | notmuch-search-toggle-hide-excluded | | notmuch-tree-toggle-hide-excluded | -| j | notmuch-jump-search | notmuch-jump-search | notmuch-jump-search | -| k | notmuch-tag-jump | notmuch-tag-jump | notmuch-tag-jump | -| l | notmuch-search-filter | notmuch-show-filter-thread | notmuch-tree-filter | -| m | notmuch-mua-new-mail | notmuch-mua-new-mail | notmuch-mua-new-mail | -| n | notmuch-search-next-thread | notmuch-show-next-open-message | notmuch-tree-next-matching-message | -| o | notmuch-search-toggle-order | | notmuch-tree-toggle-order | -| p | notmuch-search-previous-thread | notmuch-show-previous-open-message | notmuch-tree-prev-matching-message | -| q | notmuch-bury-or-kill-this-buffer | notmuch-bury-or-kill-this-buffer | notmuch-bury-or-kill-this-buffer | -| r | notmuch-search-reply-to-thread-sender | notmuch-show-reply-sender | notmuch-show-reply-sender | -| s | notmuch-search | notmuch-search | notmuch-search | -| t | notmuch-search-filter-by-tag | toggle-truncate-lines | notmuch-tree-filter-by-tag | -| u | | | | -| v | | | notmuch-show-view-all-mime-parts | -| w | | notmuch-show-save-attachments | notmuch-show-save-attachments | -| x | notmuch-bury-or-kill-this-buffer | notmuch-show-archive-message-then-next-or-exit | notmuch-tree-quit | -| y | | | | -| z | notmuch-tree | notmuch-tree | notmuch-tree-to-tree | -| A | | notmuch-show-archive-thread-then-next | notmuch-tree-archive-thread | -| F | | notmuch-show-forward-open-messages | | -| G | notmuch-poll-and-refresh-this-buffer | notmuch-poll-and-refresh-this-buffer | notmuch-poll-and-refresh-this-buffer | -| N | | notmuch-show-next-message | notmuch-tree-next-message | -| O | | | | -| P | | notmuch-show-previous-message | notmuch-tree-prev-message | -| R | notmuch-search-reply-to-thread | notmuch-show-reply | notmuch-show-reply | -| S | | | notmuch-search-from-tree-current-query | -| V | | notmuch-show-view-raw-message | notmuch-show-view-raw-message | -| X | | notmuch-show-archive-thread-then-exit | | -| Z | notmuch-tree-from-search-current-query | notmuch-tree-from-show-current-query | | -| =!= | | notmuch-show-toggle-elide-non-matching | | -| =#= | | notmuch-show-print-message | | -| =%= | | notmuch-show-replace-msg | | -| =$= | | notmuch-show-toggle-process-crypto | | -| =*= | notmuch-search-tag-all | notmuch-show-tag-all | notmuch-tree-tag-thread | -| + | notmuch-search-add-tag | notmuch-show-add-tag | notmuch-tree-add-tag | -| - | notmuch-search-remove-tag | notmuch-show-remove-tag | notmuch-tree-remove-tag | -| . | | notmuch-show-part-map | | -| < | notmuch-search-first-thread | notmuch-show-toggle-thread-indentation | | -| | notmuch-search-scroll-down | notmuch-show-rewind | notmuch-tree-scroll-message-window-back | -| | notmuch-search-show-thread | notmuch-show-toggle-message | notmuch-tree-show-message | -| | notmuch-search-scroll-up | notmuch-show-advance | notmuch-tree-scroll-or-next | -| | | notmuch-show-next-button | notmuch-show-next-button | -| | | notmuch-show-previous-button | notmuch-show-previous-button | -| = | notmuch-refresh-this-buffer | notmuch-refresh-this-buffer | notmuch-tree-refresh-view | -| > | notmuch-search-last-thread | | | -| ? | notmuch-help | notmuch-help | notmuch-help | -| \vert | | notmuch-show-pipe-message | notmuch-show-pipe-message | -| [remap undo] | notmuch-tag-undo | notmuch-tag-undo | notmuch-tag-undo | -|--------------+----------------------------------------+-------------------------------------------------------+-----------------------------------------| +|--------------+----------------------------------------------+-------------------------------------------------------+--------------------------------------------| +| Key | Search Mode | Show Mode | Tree Mode | +|--------------+----------------------------------------------+-------------------------------------------------------+--------------------------------------------| +| a | notmuch-search-archive-thread | notmuch-show-archive-message-then-next-or-next-thread | notmuch-tree-archive-message-then-next | +| b | notmuch-search-scroll-down | notmuch-show-resend-message | notmuch-show-resend-message | +| c | notmuch-search-stash-map | notmuch-show-stash-map | notmuch-show-stash-map | +| d | | | | +| e | | | (notmuch-tree-button-activate) | +| f | | notmuch-show-forward-message | notmuch-show-forward-message | +| g | | | | +| h | | notmuch-show-toggle-visibility-headers | | +| i | notmuch-search-toggle-hide-excluded | | notmuch-tree-toggle-hide-excluded | +| j | notmuch-jump-search | notmuch-jump-search | notmuch-jump-search | +| k | notmuch-tag-jump | notmuch-tag-jump | notmuch-tag-jump | +| l | notmuch-search-filter | notmuch-show-filter-thread | notmuch-tree-filter | +| m | notmuch-mua-new-mail | notmuch-mua-new-mail | notmuch-mua-new-mail | +| n | notmuch-search-next-thread | notmuch-show-next-open-message | notmuch-tree-next-matching-message | +| o | notmuch-search-toggle-order | | notmuch-tree-toggle-order | +| p | notmuch-search-previous-thread | notmuch-show-previous-open-message | notmuch-tree-prev-matching-message | +| q | notmuch-bury-or-kill-this-buffer | notmuch-bury-or-kill-this-buffer | notmuch-bury-or-kill-this-buffer | +| r | notmuch-search-reply-to-thread-sender | notmuch-show-reply-sender | notmuch-show-reply-sender | +| s | notmuch-search | notmuch-search | notmuch-search | +| t | notmuch-search-filter-by-tag | toggle-truncate-lines | notmuch-tree-filter-by-tag | +| u | notmuch-unthreaded | notmuch-unthreaded | notmuch-unthreaded | +| v | | | notmuch-show-view-all-mime-parts | +| w | | notmuch-show-save-attachments | notmuch-show-save-attachments | +| x | notmuch-bury-or-kill-this-buffer | notmuch-show-archive-message-then-next-or-exit | notmuch-tree-quit | +| y | | | | +| z | notmuch-tree | notmuch-tree | notmuch-tree-to-tree | +| A | | notmuch-show-archive-thread-then-next | notmuch-tree-archive-thread | +| F | | notmuch-show-forward-open-messages | | +| G | notmuch-poll-and-refresh-this-buffer | notmuch-poll-and-refresh-this-buffer | notmuch-poll-and-refresh-this-buffer | +| N | | notmuch-show-next-message | notmuch-tree-next-message | +| O | | | | +| P | | notmuch-show-previous-message | notmuch-tree-prev-message | +| R | notmuch-search-reply-to-thread | notmuch-show-reply | notmuch-show-reply | +| S | | | notmuch-search-from-tree-current-query | +| U | notmuch-unthreaded-from-search-current-query | notmuch-unthreaded-from-show-current-query | notmuch-unthreaded-from-tree-current-query | +| V | | notmuch-show-view-raw-message | notmuch-show-view-raw-message | +| X | | notmuch-show-archive-thread-then-exit | | +| Z | notmuch-tree-from-search-current-query | notmuch-tree-from-show-current-query | | +| =!= | | notmuch-show-toggle-elide-non-matching | | +| =#= | | notmuch-show-print-message | | +| =%= | | notmuch-show-replace-msg | | +| =$= | | notmuch-show-toggle-process-crypto | | +| =*= | notmuch-search-tag-all | notmuch-show-tag-all | notmuch-tree-tag-thread | +| + | notmuch-search-add-tag | notmuch-show-add-tag | notmuch-tree-add-tag | +| - | notmuch-search-remove-tag | notmuch-show-remove-tag | notmuch-tree-remove-tag | +| . | | notmuch-show-part-map | | +| < | notmuch-search-first-thread | notmuch-show-toggle-thread-indentation | | +| | notmuch-search-scroll-down | notmuch-show-rewind | notmuch-tree-scroll-message-window-back | +| | notmuch-search-show-thread | notmuch-show-toggle-message | notmuch-tree-show-message | +| | notmuch-search-scroll-up | notmuch-show-advance | notmuch-tree-scroll-or-next | +| | | notmuch-show-next-button | notmuch-show-next-button | +| | | notmuch-show-previous-button | notmuch-show-previous-button | +| = | notmuch-refresh-this-buffer | notmuch-refresh-this-buffer | notmuch-tree-refresh-view | +| > | notmuch-search-last-thread | | | +| ? | notmuch-help | notmuch-help | notmuch-help | +| \vert | | notmuch-show-pipe-message | notmuch-show-pipe-message | +| [remap undo] | notmuch-tag-undo | notmuch-tag-undo | notmuch-tag-undo | +|--------------+----------------------------------------------+-------------------------------------------------------+--------------------------------------------| -- 2.45.2 From bc989209171d406b3671024542e59b86b0ecb23d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rudolf=20Adamkovi=C4=8D?= Date: Wed, 13 Dec 2023 22:39:02 +0100 Subject: [PATCH 10/16] emacs: Fix saved-search buffer titles REPRODUCTION STEPS: (let ((notmuch-saved-searches (list (list :name "Emacs List" :query "query:lists-emacs") (list :name "All Lists" :query "query:lists")))) (notmuch-search-buffer-title "query:lists-emacs" )) ACTUAL: "*notmuch-saved-search-[ All Lists ]-emacs*" EXPECTED: "*notmuch-saved-search-Emacs List*" --- emacs/notmuch.el | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 2a73ffa5..f55e9b42 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -973,17 +973,20 @@ unthreaded) and whether it's SAVED (t or nil)." (defun notmuch-search-buffer-title (query &optional type) "Returns the title for a buffer with notmuch search results." (let* ((saved-search - (let (longest - (longest-length 0)) - (cl-loop for tuple in notmuch-saved-searches - if (let ((quoted-query - (regexp-quote - (notmuch-saved-search-get tuple :query)))) - (and (string-match (concat "^" quoted-query) query) - (> (length (match-string 0 query)) - longest-length))) - do (setq longest tuple)) - longest)) + (cl-loop with match + with match-length = 0 + for candidate in notmuch-saved-searches + for length = (let* ((query* (notmuch-saved-search-get + candidate + :query)) + (regexp (concat "^" + (regexp-quote query*)))) + (and (string-match regexp query) + (length (match-string 0 query)))) + if (and length (> length match-length)) + do (setq match candidate + match-length length) + finally return match)) (saved-search-name (notmuch-saved-search-get saved-search :name)) (saved-search-type (notmuch-saved-search-get saved-search :search-type)) (saved-search-query (notmuch-saved-search-get saved-search :query))) -- 2.45.2 From a691d54280b574035d38f3827d5caca9d0a6ae5b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 21 Dec 2023 09:04:00 -0800 Subject: [PATCH 11/16] CLI/show: warn if crypto options are used with mbox format This limitation seems somewhat hard to fix, but at least try to warn users when combining crypto operations with mbox output format. Because the default is --decrypt=auto, the warning is omitted if --decrypt=auto is specified. While this is not great, it seems more wrong to always warn, or to change the default because of this. --- notmuch-show.c | 8 ++++++++ test/T520-show.sh | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/notmuch-show.c b/notmuch-show.c index 7fb40ce9..8c23f821 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1399,6 +1399,14 @@ notmuch_show_command (notmuch_database_t *notmuch, int argc, char *argv[]) fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); return EXIT_FAILURE; } + if (params.crypto.decrypt != NOTMUCH_DECRYPT_FALSE + && params.crypto.decrypt != NOTMUCH_DECRYPT_AUTO) { + fprintf (stderr, "Warning: mbox format does not support decryption (ignored)\n"); + } + if (params.crypto.verify) { + fprintf (stderr, + "Warning: mbox format does not support signature verification (ignored)\n"); + } } else if (format == NOTMUCH_FORMAT_RAW) { /* raw format only supports single message display */ single_message = true; diff --git a/test/T520-show.sh b/test/T520-show.sh index 8121c3db..1f7f6aa8 100755 --- a/test/T520-show.sh +++ b/test/T520-show.sh @@ -17,6 +17,25 @@ notmuch show foo.. exit_code=$? test_expect_equal 1 $exit_code +test_begin_subtest "warning for --mbox --decrypt" +notmuch show --format=mbox --decrypt=true '*' 1>/dev/null 2>OUTPUT +echo $? >> OUTPUT +cat < EXPECTED +Warning: mbox format does not support decryption (ignored) +Warning: mbox format does not support signature verification (ignored) +0 +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "warning for --mbox --verify" +notmuch show --format=mbox --verify '*' 1>/dev/null 2>OUTPUT +echo $? >> OUTPUT +cat < EXPECTED +Warning: mbox format does not support signature verification (ignored) +0 +EOF +test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "notmuch show --sort=newest-first" notmuch show --entire-thread=true '*' > EXPECTED notmuch show --entire-thread=true --sort=newest-first '*' > OUTPUT -- 2.45.2 From be27c7be1e3d724dbcbdc28ecab1a8fca9f8604b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 20 May 2024 08:58:56 -0300 Subject: [PATCH 12/16] test/emacs-show: add regression test for subjects with CR/NL This subject is known to be problematic for notmuch-tree. --- test/T450-emacs-show.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh index 7c6a946a..ff340f06 100755 --- a/test/T450-emacs-show.sh +++ b/test/T450-emacs-show.sh @@ -460,4 +460,19 @@ subject4=$(grep '^Subject:' $FILE4) subject=$(grep '^Subject:' OUTPUT) test_expect_equal "$subject4" "$subject" +test_begin_subtest "notmuch-show for message with subject with embedded CRNL" +add_message "[subject]=\"=?UTF-8?B?8J+Pi++4jw==?= A SALE to boost your =?UTF-8?Q?workout=0D=0A?=\" [body]=the-message-body" +test_emacs "(notmuch-show \"id:${gen_msg_id}\") + (test-output \"OUTPUT.raw\")" +cat <EXPECTED +Notmuch Test Suite (2001-01-05) (inbox) +Subject: 🏋️ A SALE to boost your workout +To: Notmuch Test Suite +Date: GENERATED_DATE + +the-message-body +EOF +notmuch_date_sanitize < OUTPUT.raw > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + test_done -- 2.45.2 From df330eef9a6cbcd239589b13c54a451a0cf87e36 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 20 May 2024 08:58:57 -0300 Subject: [PATCH 13/16] test/emacs-tree: add known broken test for subject with CR/NL The test is intentionally vague as it's hard to pin down the correct output before the code is fixed. --- test/T460-emacs-tree.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh index 9388a8ed..69a9df74 100755 --- a/test/T460-emacs-tree.sh +++ b/test/T460-emacs-tree.sh @@ -222,6 +222,15 @@ test_emacs '(let ((notmuch-tree-outline-enabled t)) # folding all messages by height or depth should look the same test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT +test_begin_subtest "notmuch-tree for message with subject with embedded CRNL" +test_subtest_known_broken +add_message "[subject]=\"=?UTF-8?B?8J+Pi++4jw==?= A SALE to boost your =?UTF-8?Q?workout=0D=0A?=\" [body]=the-message-body" +test_emacs "(notmuch-tree \"id:${gen_msg_id}\") + (notmuch-test-wait) + (test-output)" +# one line of output, plus "End of search results." +test_expect_equal "$(wc -l < OUTPUT)" 2 + add_email_corpus duplicate ID3=87r2ecrr6x.fsf@zephyr.silentflame.com -- 2.45.2 From bf9b9fe0469d24d1f0924074ffd5904363cb49cc Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 20 May 2024 08:58:58 -0300 Subject: [PATCH 14/16] emacs/tree: sanitize subjects when drawing tree This fixes the bug reported in id:6F2EF901-8B4B-44FF-83C5-22F732BA95A6@gmail.com Unfortunately it turns out our test data has several tabs in the subject lines. The expected output was updated to reflect their removal and the ripple effect of several more subjects matching the previous ones. --- emacs/notmuch-tree.el | 4 +++- test/T460-emacs-tree.sh | 1 - .../notmuch-tree-tag-inbox-with-excluded | 22 +++++++++---------- .../notmuch-tree-tag-inbox-without-excluded | 18 +++++++-------- ...notmuch-unthreaded-tag-inbox-with-excluded | 16 +++++++------- ...much-unthreaded-tag-inbox-without-excluded | 12 +++++----- test/emacs-tree.expected-output/inbox-outline | 14 ++++++------ .../notmuch-tree-single-thread | 4 ++-- .../notmuch-tree-tag-inbox | 22 +++++++++---------- .../notmuch-tree-tag-inbox-oldest-first | 22 +++++++++---------- .../notmuch-tree-tag-inbox-tagged | 22 +++++++++---------- .../notmuch-tree-tag-inbox-thread-tagged | 22 +++++++++---------- .../result-format-function | 22 +++++++++---------- .../result-format-function | 16 +++++++------- 14 files changed, 109 insertions(+), 108 deletions(-) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index faec89c4..2332f020 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -946,7 +946,9 @@ unchanged ADDRESS if parsing fails." 'face face))) ((string-equal field "subject") - (let ((bare-subject (notmuch-show-strip-re (plist-get headers :Subject))) + (let ((bare-subject + (notmuch-sanitize + (notmuch-show-strip-re (plist-get headers :Subject)))) (previous-subject notmuch-tree-previous-subject) (face (if match 'notmuch-tree-match-subject-face diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh index 69a9df74..4243f65a 100755 --- a/test/T460-emacs-tree.sh +++ b/test/T460-emacs-tree.sh @@ -223,7 +223,6 @@ test_emacs '(let ((notmuch-tree-outline-enabled t)) test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT test_begin_subtest "notmuch-tree for message with subject with embedded CRNL" -test_subtest_known_broken add_message "[subject]=\"=?UTF-8?B?8J+Pi++4jw==?= A SALE to boost your =?UTF-8?Q?workout=0D=0A?=\" [body]=the-message-body" test_emacs "(notmuch-tree \"id:${gen_msg_id}\") (notmuch-test-wait) diff --git a/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded index 5c6b2d7a..0f640b3f 100644 --- a/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded +++ b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-with-excluded @@ -1,5 +1,5 @@ - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) @@ -13,8 +13,8 @@ 2009-11-17 Alex Botero-Lowry ┬►[notmuch] preliminary FreeBSD support (attachment inbox unread) 2009-11-17 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox unread) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] What a great idea! (inbox unread) @@ -31,22 +31,22 @@ 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman ╰─► ... (attachment inbox signed unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (deleted inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (deleted inbox unread) 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (deleted inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (deleted inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (deleted inbox unread) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low ╰┬► ... (inbox unread) 2009-11-18 Jjgod Jiang ╰┬► ... (inbox unread) 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox unread) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox unread) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) - 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (deleted inbox unread) 2010-12-16 Olivier Berger ─►Essai accentué (inbox unread) 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox unread) diff --git a/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded index 55806d18..34abae80 100644 --- a/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded +++ b/test/emacs-exclude.expected-output/notmuch-tree-tag-inbox-without-excluded @@ -1,5 +1,5 @@ - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) @@ -13,8 +13,8 @@ 2009-11-17 Alex Botero-Lowry ┬►[notmuch] preliminary FreeBSD support (attachment inbox unread) 2009-11-17 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox unread) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] What a great idea! (inbox unread) @@ -31,19 +31,19 @@ 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman ╰─► ... (attachment inbox signed unread) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low ╰┬► ... (inbox unread) 2009-11-18 Jjgod Jiang ╰┬► ... (inbox unread) 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox unread) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox unread) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) - 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2010-12-16 Olivier Berger ─►Essai accentué (inbox unread) 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox unread) End of search results. diff --git a/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-with-excluded b/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-with-excluded index d55818e8..ea8bf3d2 100644 --- a/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-with-excluded +++ b/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-with-excluded @@ -1,5 +1,5 @@ - 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Lars Kellogg-Stedman [notmuch] Working with Maildir storage? (inbox signed unread) 2009-11-17 Mikhail Gusarov [notmuch] Working with Maildir storage? (inbox signed unread) @@ -10,7 +10,7 @@ 2009-11-17 Mikhail Gusarov [notmuch] [PATCH] Handle rename of message file (inbox unread) 2009-11-17 Keith Packard [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard [notmuch] Working with Maildir storage? (inbox unread) - 2009-11-17 Keith Packard [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) 2009-11-17 Jan Janak [notmuch] [PATCH] Older versions of install do not support -C. (inbox unread) 2009-11-17 Jan Janak [notmuch] What a great idea! (inbox unread) 2009-11-17 Jan Janak [notmuch] What a great idea! (inbox unread) @@ -18,24 +18,24 @@ 2009-11-17 Adrian Perez de Cast [notmuch] Introducing myself (inbox signed unread) 2009-11-17 Aron Griffis [notmuch] archive (inbox unread) 2009-11-17 Ingmar Vanhassel [notmuch] [PATCH] Typsos (inbox unread) - 2009-11-18 Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) 2009-11-18 Lars Kellogg-Stedman [notmuch] Working with Maildir storage? (inbox signed unread) 2009-11-18 Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) - 2009-11-18 Stewart Smith [notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (deleted inbox unread) + 2009-11-18 Stewart Smith [notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (deleted inbox unread) 2009-11-18 Stewart Smith [notmuch] [PATCH 2/2] Read mail directory in inode number order (deleted inbox unread) 2009-11-18 Keith Packard [notmuch] New to the list (inbox unread) 2009-11-18 Keith Packard [notmuch] Introducing myself (inbox unread) 2009-11-18 Keith Packard [notmuch] archive (inbox unread) - 2009-11-18 Stewart Smith [notmuch] [PATCH] count_files: sort directory in inode order before statting (deleted inbox unread) + 2009-11-18 Stewart Smith [notmuch] [PATCH] count_files: sort directory in inode order before statting (deleted inbox unread) 2009-11-18 Jjgod Jiang [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) - 2009-11-18 Jan Janak [notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Jan Janak [notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) 2009-11-18 Rolland Santimano [notmuch] Link to mailing list archives ? (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Jjgod Jiang [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] request for pull (inbox unread) - 2009-11-18 Keith Packard [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) 2009-11-18 Carl Worth [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-18 Carl Worth [notmuch] Working with Maildir storage? (inbox unread) diff --git a/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-without-excluded b/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-without-excluded index 80c67d07..fabb43e4 100644 --- a/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-without-excluded +++ b/test/emacs-exclude.expected-output/notmuch-unthreaded-tag-inbox-without-excluded @@ -1,5 +1,5 @@ - 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Lars Kellogg-Stedman [notmuch] Working with Maildir storage? (inbox signed unread) 2009-11-17 Mikhail Gusarov [notmuch] Working with Maildir storage? (inbox signed unread) @@ -10,7 +10,7 @@ 2009-11-17 Mikhail Gusarov [notmuch] [PATCH] Handle rename of message file (inbox unread) 2009-11-17 Keith Packard [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard [notmuch] Working with Maildir storage? (inbox unread) - 2009-11-17 Keith Packard [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) 2009-11-17 Jan Janak [notmuch] [PATCH] Older versions of install do not support -C. (inbox unread) 2009-11-17 Jan Janak [notmuch] What a great idea! (inbox unread) 2009-11-17 Jan Janak [notmuch] What a great idea! (inbox unread) @@ -18,7 +18,7 @@ 2009-11-17 Adrian Perez de Cast [notmuch] Introducing myself (inbox signed unread) 2009-11-17 Aron Griffis [notmuch] archive (inbox unread) 2009-11-17 Ingmar Vanhassel [notmuch] [PATCH] Typsos (inbox unread) - 2009-11-18 Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) 2009-11-18 Lars Kellogg-Stedman [notmuch] Working with Maildir storage? (inbox signed unread) 2009-11-18 Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman [notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) @@ -26,13 +26,13 @@ 2009-11-18 Keith Packard [notmuch] Introducing myself (inbox unread) 2009-11-18 Keith Packard [notmuch] archive (inbox unread) 2009-11-18 Jjgod Jiang [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) - 2009-11-18 Jan Janak [notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Jan Janak [notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) 2009-11-18 Rolland Santimano [notmuch] Link to mailing list archives ? (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Jjgod Jiang [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] request for pull (inbox unread) - 2009-11-18 Keith Packard [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) 2009-11-18 Alexander Botero-Low [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) 2009-11-18 Carl Worth [notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-18 Carl Worth [notmuch] Working with Maildir storage? (inbox unread) diff --git a/test/emacs-tree.expected-output/inbox-outline b/test/emacs-tree.expected-output/inbox-outline index 9119a916..4acb62a9 100644 --- a/test/emacs-tree.expected-output/inbox-outline +++ b/test/emacs-tree.expected-output/inbox-outline @@ -1,24 +1,24 @@ 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox unread) 2010-12-16 Olivier Berger ─►Essai accentué (inbox unread) 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox unread) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox unread) 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself (inbox signed unread) 2009-11-17 Israel Herraiz ┬►[notmuch] New to the list (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] What a great idea! (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox unread) 2009-11-17 Aron Griffis ┬►[notmuch] archive (inbox unread) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir storage? (inbox signed unread) - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox unread) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox unread) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox unread) 2009-11-17 Alex Botero-Lowry ┬►[notmuch] preliminary FreeBSD support (attachment inbox unread) diff --git a/test/emacs-tree.expected-output/notmuch-tree-single-thread b/test/emacs-tree.expected-output/notmuch-tree-single-thread index 2285d10e..3da7628d 100644 --- a/test/emacs-tree.expected-output/notmuch-tree-single-thread +++ b/test/emacs-tree.expected-output/notmuch-tree-single-thread @@ -1,5 +1,5 @@ - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) diff --git a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox index f28d4856..3970e8e8 100644 --- a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox +++ b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox @@ -1,8 +1,8 @@ 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox unread) 2010-12-16 Olivier Berger ─►Essai accentué (inbox unread) 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox unread) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself (inbox signed unread) @@ -19,8 +19,8 @@ 2009-11-17 Aron Griffis ┬►[notmuch] archive (inbox unread) 2009-11-18 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir storage? (inbox signed unread) 2009-11-17 Mikhail Gusarov ├┬► ... (inbox signed unread) 2009-11-17 Lars Kellogg-Stedman │╰┬► ... (inbox signed unread) @@ -28,23 +28,23 @@ 2009-11-17 Keith Packard │ ╰┬► ... (inbox unread) 2009-11-18 Lars Kellogg-Stedman │ ╰─► ... (inbox signed unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) - 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox unread) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low ╰┬► ... (inbox unread) 2009-11-18 Jjgod Jiang ╰┬► ... (inbox unread) 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox unread) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman ╰─► ... (attachment inbox signed unread) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox unread) diff --git a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-oldest-first b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-oldest-first index 588fc583..4277eda5 100644 --- a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-oldest-first +++ b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-oldest-first @@ -1,5 +1,5 @@ - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) @@ -13,8 +13,8 @@ 2009-11-17 Alex Botero-Lowry ┬►[notmuch] preliminary FreeBSD support (attachment inbox unread) 2009-11-17 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox unread) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Jan Janak ┬►[notmuch] What a great idea! (inbox unread) @@ -31,22 +31,22 @@ 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman ╰─► ... (attachment inbox signed unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low ╰┬► ... (inbox unread) 2009-11-18 Jjgod Jiang ╰┬► ... (inbox unread) 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox unread) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox unread) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) - 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox unread) 2010-12-16 Olivier Berger ─►Essai accentué (inbox unread) 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox unread) diff --git a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-tagged b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-tagged index 428c0ae8..eb62e144 100644 --- a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-tagged +++ b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-tagged @@ -1,8 +1,8 @@ 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox unread) 2010-12-16 Olivier Berger ─►Essai accentué (inbox test_tag unread) 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox unread) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself (inbox signed unread) @@ -19,8 +19,8 @@ 2009-11-17 Aron Griffis ┬►[notmuch] archive (inbox unread) 2009-11-18 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir storage? (inbox signed unread) 2009-11-17 Mikhail Gusarov ├┬► ... (inbox signed unread) 2009-11-17 Lars Kellogg-Stedman │╰┬► ... (inbox signed unread) @@ -28,23 +28,23 @@ 2009-11-17 Keith Packard │ ╰┬► ... (inbox unread) 2009-11-18 Lars Kellogg-Stedman │ ╰─► ... (inbox signed unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) - 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox unread) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low ╰┬► ... (inbox unread) 2009-11-18 Jjgod Jiang ╰┬► ... (inbox unread) 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox unread) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman ╰─► ... (attachment inbox signed unread) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox unread) diff --git a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-thread-tagged b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-thread-tagged index 828c5251..c90d726e 100644 --- a/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-thread-tagged +++ b/test/emacs-tree.expected-output/notmuch-tree-tag-inbox-thread-tagged @@ -1,8 +1,8 @@ 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox unread) 2010-12-16 Olivier Berger ─►Essai accentué (inbox unread) 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox unread) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox unread) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself (inbox signed unread) @@ -19,8 +19,8 @@ 2009-11-17 Aron Griffis ┬►[notmuch] archive (inbox unread) 2009-11-18 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread) + 2009-11-18 Carl Worth ╰─► ... (inbox unread) 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir storage? (inbox signed test_thread_tag unread) 2009-11-17 Mikhail Gusarov ├┬► ... (inbox signed test_thread_tag unread) 2009-11-17 Lars Kellogg-Stedman │╰┬► ... (inbox signed test_thread_tag unread) @@ -28,23 +28,23 @@ 2009-11-17 Keith Packard │ ╰┬► ... (inbox test_thread_tag unread) 2009-11-18 Lars Kellogg-Stedman │ ╰─► ... (inbox signed test_thread_tag unread) 2009-11-18 Carl Worth ╰─► ... (inbox test_thread_tag unread) - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 (inbox unread) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox unread) 2009-11-17 Keith Packard ╰┬► ... (inbox unread) 2009-11-18 Carl Worth ╰─► ... (inbox unread) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) - 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox unread) + 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox unread) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox unread) 2009-11-18 Alexander Botero-Low ╰┬► ... (inbox unread) 2009-11-18 Jjgod Jiang ╰┬► ... (inbox unread) 2009-11-18 Alexander Botero-Low ╰─► ... (inbox unread) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox unread) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox unread) 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox unread) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox unread) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment inbox signed unread) 2009-11-18 Lars Kellogg-Stedman ╰─► ... (attachment inbox signed unread) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox unread) diff --git a/test/emacs-tree.expected-output/result-format-function b/test/emacs-tree.expected-output/result-format-function index 7eb24696..42285f0e 100644 --- a/test/emacs-tree.expected-output/result-format-function +++ b/test/emacs-tree.expected-output/result-format-function @@ -1,8 +1,8 @@ 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install ( ui) 2010-12-16 Olivier Berger ─►Essai accentué ( ui) 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once ( ui) - 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (& ui) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop ( ui) + 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (& ui) + 2009-11-18 Carl Worth ╰─► ... ( ui) 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos ( ui) 2009-11-18 Carl Worth ╰─► ... ( ui) 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself ( =ui) @@ -19,8 +19,8 @@ 2009-11-17 Aron Griffis ┬►[notmuch] archive ( ui) 2009-11-18 Keith Packard ╰┬► ... ( ui) 2009-11-18 Carl Worth ╰─► ... ( ui) - 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags ( ui) - 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags ( ui) + 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags ( ui) + 2009-11-18 Carl Worth ╰─► ... ( ui) 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir storage? ( = i) 2009-11-17 Mikhail Gusarov ├┬► ... ( =ui) 2009-11-17 Lars Kellogg-Stedman │╰┬► ... ( =ui) @@ -28,23 +28,23 @@ 2009-11-17 Keith Packard │ ╰┬► ... ( ui) 2009-11-18 Lars Kellogg-Stedman │ ╰─► ... ( =ui) 2009-11-18 Carl Worth ╰─► ... ( ui) - 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers ( i) - 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 ( ui) + 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers ( i) + 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4 ( ui) 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers ( ui) 2009-11-17 Keith Packard ╰┬► ... ( ui) 2009-11-18 Carl Worth ╰─► ... ( ui) - 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap ( ui) - 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap ( ui) + 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap ( ui) + 2009-11-18 Alexander Botero-Low ╰─► ... ( ui) 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull ( ui) 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues ( ui) 2009-11-18 Alexander Botero-Low ╰┬► ... ( ui) 2009-11-18 Jjgod Jiang ╰┬► ... ( ui) 2009-11-18 Alexander Botero-Low ╰─► ... ( ui) 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? ( ui) - 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags ( ui) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting ( ui) + 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags ( ui) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting ( ui) 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order ( ui) - 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. ( ui) + 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. ( ui) 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (&=ui) 2009-11-18 Lars Kellogg-Stedman ╰─► ... (&=ui) 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file ( ui) diff --git a/test/emacs-unthreaded.expected-output/result-format-function b/test/emacs-unthreaded.expected-output/result-format-function index bcb10b96..91bbf694 100644 --- a/test/emacs-unthreaded.expected-output/result-format-function +++ b/test/emacs-unthreaded.expected-output/result-format-function @@ -12,24 +12,24 @@ 2009-11-18 Carl Worth [notmuch] Working with Maildir storage? ( ui) 2009-11-18 Carl Worth [notmuch] [PATCH 1/2] Close message file after parsing message headers( ui) 2009-11-18 Alexander Botero-Low[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap( ui) - 2009-11-18 Keith Packard [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap( ui) + 2009-11-18 Keith Packard [notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap( ui) 2009-11-18 Alexander Botero-Low[notmuch] request for pull ( ui) 2009-11-18 Alexander Botero-Low[notmuch] Mac OS X/Darwin compatibility issues ( ui) 2009-11-18 Jjgod Jiang [notmuch] Mac OS X/Darwin compatibility issues ( ui) 2009-11-18 Alexander Botero-Low[notmuch] Mac OS X/Darwin compatibility issues ( ui) 2009-11-18 Rolland Santimano [notmuch] Link to mailing list archives ? ( ui) - 2009-11-18 Jan Janak [notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags( ui) + 2009-11-18 Jan Janak [notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags( ui) 2009-11-18 Jjgod Jiang [notmuch] Mac OS X/Darwin compatibility issues ( ui) - 2009-11-18 Stewart Smith [notmuch] [PATCH] count_files: sort directory in inode order before statting( ui) + 2009-11-18 Stewart Smith [notmuch] [PATCH] count_files: sort directory in inode order before statting( ui) 2009-11-18 Keith Packard [notmuch] archive ( ui) 2009-11-18 Keith Packard [notmuch] Introducing myself ( ui) 2009-11-18 Keith Packard [notmuch] New to the list ( ui) 2009-11-18 Stewart Smith [notmuch] [PATCH 2/2] Read mail directory in inode number order( ui) - 2009-11-18 Stewart Smith [notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs.( ui) + 2009-11-18 Stewart Smith [notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs.( ui) 2009-11-18 Lars Kellogg-Stedman[notmuch] "notmuch help" outputs to stderr? (&=ui) 2009-11-18 Lars Kellogg-Stedman[notmuch] "notmuch help" outputs to stderr? (&=ui) 2009-11-18 Lars Kellogg-Stedman[notmuch] Working with Maildir storage? ( =ui) - 2009-11-18 Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop(& ui) + 2009-11-18 Alex Botero-Lowry [notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop(& ui) 2009-11-17 Ingmar Vanhassel [notmuch] [PATCH] Typsos ( ui) 2009-11-17 Aron Griffis [notmuch] archive ( ui) 2009-11-17 Adrian Perez de Cast[notmuch] Introducing myself ( =ui) @@ -37,7 +37,7 @@ 2009-11-17 Jan Janak [notmuch] What a great idea! ( ui) 2009-11-17 Jan Janak [notmuch] What a great idea! ( ui) 2009-11-17 Jan Janak [notmuch] [PATCH] Older versions of install do not support -C.( ui) - 2009-11-17 Keith Packard [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags( ui) + 2009-11-17 Keith Packard [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags( ui) 2009-11-17 Keith Packard [notmuch] Working with Maildir storage? ( ui) 2009-11-17 Keith Packard [notmuch] [PATCH 1/2] Close message file after parsing message headers( ui) 2009-11-17 Mikhail Gusarov [notmuch] [PATCH] Handle rename of message file ( ui) @@ -48,6 +48,6 @@ 2009-11-17 Mikhail Gusarov [notmuch] Working with Maildir storage? ( =ui) 2009-11-17 Lars Kellogg-Stedman[notmuch] Working with Maildir storage? ( =ui) 2009-11-17 Carl Worth [notmuch] [PATCH 1/2] Close message file after parsing message headers( ui) - 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4( ui) - 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 1/2] Close message file after parsing message headers( ui) + 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 2/2] Include to get uint32_t in C++ file with gcc 4.4( ui) + 2009-11-17 Mikhail Gusarov [notmuch] [PATCH 1/2] Close message file after parsing message headers( ui) End of search results. -- 2.45.2 From 4e85abda157eac8888809b2dde885f60f312a5fb Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 9 Aug 2024 10:18:54 -0300 Subject: [PATCH 15/16] Revert "emacs: Fix saved-search buffer titles" This reverts commit bc989209171d406b3671024542e59b86b0ecb23d. This was applied unintentionally to master while still under discussion. --- emacs/notmuch.el | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index f55e9b42..2a73ffa5 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -973,20 +973,17 @@ unthreaded) and whether it's SAVED (t or nil)." (defun notmuch-search-buffer-title (query &optional type) "Returns the title for a buffer with notmuch search results." (let* ((saved-search - (cl-loop with match - with match-length = 0 - for candidate in notmuch-saved-searches - for length = (let* ((query* (notmuch-saved-search-get - candidate - :query)) - (regexp (concat "^" - (regexp-quote query*)))) - (and (string-match regexp query) - (length (match-string 0 query)))) - if (and length (> length match-length)) - do (setq match candidate - match-length length) - finally return match)) + (let (longest + (longest-length 0)) + (cl-loop for tuple in notmuch-saved-searches + if (let ((quoted-query + (regexp-quote + (notmuch-saved-search-get tuple :query)))) + (and (string-match (concat "^" quoted-query) query) + (> (length (match-string 0 query)) + longest-length))) + do (setq longest tuple)) + longest)) (saved-search-name (notmuch-saved-search-get saved-search :name)) (saved-search-type (notmuch-saved-search-get saved-search :search-type)) (saved-search-query (notmuch-saved-search-get saved-search :query))) -- 2.45.2 From 2355ff274d3694fc79c655bb45c61245fb9a9302 Mon Sep 17 00:00:00 2001 From: Pengji Zhang Date: Fri, 16 Aug 2024 16:25:48 +0800 Subject: [PATCH 16/16] emacs/mua: Correct autoload cookies This is a follow-up to [1: 8d06dfce]. Per Info node '(elisp)Autoload', autoload cookies should start with ';;;###'. 1: 2024-04-04 8d06dfce175593aebae9a759c9167df4988a3444 emacs: Autoload notmuch-user-agent related functions --- emacs/notmuch-mua.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index b80e5976..a75b0f5c 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -424,7 +424,7 @@ instead of `message-mode' and SWITCH-FUNCTION is mandatory." (addr (and good-tokens (mapconcat #'identity good-tokens ", ")))) (message-replace-header header addr)))))) -;;;#autoload +;;;###autoload (defun notmuch-mua-mail (&optional to subject other-headers _continue switch-function yank-action send-actions return-action &rest _ignored) @@ -646,24 +646,24 @@ unencrypted. Really send? ")))) (message-send-and-exit arg) (message-send arg))))) -;;;#autoload +;;;###autoload (defun notmuch-mua-send-and-exit (&optional arg) (interactive "P") (notmuch-mua-send-common arg t)) -;;;#autoload +;;;###autoload (defun notmuch-mua-send (&optional arg) (interactive "P") (notmuch-mua-send-common arg)) -;;;#autoload +;;;###autoload (defun notmuch-mua-kill-buffer () (interactive) (message-kill-buffer)) ;;; _ -;;;#autoload +;;;###autoload (define-mail-user-agent 'notmuch-user-agent 'notmuch-mua-mail 'notmuch-mua-send-and-exit -- 2.45.2