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.
This commit is contained in:
David Bremner 2024-05-20 08:58:58 -03:00
parent df330eef9a
commit bf9b9fe046
14 changed files with 109 additions and 108 deletions

View file

@ -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

View file

@ -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)

View file

@ -14,7 +14,7 @@
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-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)
@ -32,7 +32,7 @@
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 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)
@ -46,7 +46,7 @@
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 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)

View file

@ -14,7 +14,7 @@
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-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)
@ -32,7 +32,7 @@
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 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)
@ -43,7 +43,7 @@
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 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.

View file

@ -2,7 +2,7 @@
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 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)
@ -20,7 +20,7 @@
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-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)
@ -34,7 +34,7 @@
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 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)

View file

@ -14,7 +14,7 @@
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-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)
@ -32,7 +32,7 @@
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 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)
@ -46,7 +46,7 @@
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 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)

View file

@ -2,7 +2,7 @@
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 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)
@ -20,7 +20,7 @@
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-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)
@ -34,7 +34,7 @@
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 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)

View file

@ -2,7 +2,7 @@
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 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)
@ -20,7 +20,7 @@
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-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)
@ -34,7 +34,7 @@
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 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)

View file

@ -2,7 +2,7 @@
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 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)
@ -20,7 +20,7 @@
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-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)
@ -34,7 +34,7 @@
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 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)