notmuch: change wrapping of subjects

If the subject in the message summary needs to be wrapped, wrap it ALL
onto the next line.  This makes long subjects easier to read.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/DOC/TODO.md b/DOC/TODO.md
index 023c89a7288b48a5c9cdd395d3cea7862a2de986..4192e93e0e3b4a94654259f5b2bc263fe7afd603 100644 (file)
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -13,7 +13,7 @@ Current priorities
 - [X] display-xcb ??
 - [ ] git log view with rebase and reword options
 - [ ] git-commit command which presents the patch and allows it to be
-      editted (with consistency checks and number updates). On :Commit
+      edited (with consistency checks and number updates). On :Commit
       the patch is applied with "git apply --cached" an if successful
       the message is added with "| git commit -F"
 - [ ] Add menu/menu-bar support
@@ -31,6 +31,9 @@ Current priorities
 Bugs to be fixed
 ----------------
 
+- [ ] notmuch shouldn't clear tag:new until *all* views
+      on search have closed.
+- [ ] I think attaching a path starting ~/ to an email fails.
 - [ ] stop consistency checking a text doc when it gets "big" ??
 - [ ] auto-sign emails..
 - [ ] message must be tagged "replied" when a reply is sent.

diff --git a/python/module-notmuch.py b/python/module-notmuch.py
index 0c5bc1f2eab40ead86cc4a64abb53bea62d18cc7..b085b82462e90018d6b2c0bfc4b5ef4fca39e8c4 100644 (file)
--- a/python/module-notmuch.py
+++ b/python/module-notmuch.py
@@ -879,7 +879,9 @@ class notmuch_query(edlib.Doc):
         self["line-format"] = ("<%BG><%TM-hilite>%TM-date_relative</>" +
                                "<tab:130> <fg:blue>%TM-authors</>" +
                                "<tab:350>%TM-size%TM-threadinfo<%TM-hilite>" +
-                               "<fg:red,bold>%TM-flag</> <wrap-margin>%TM-subject</></>")
+                               "<fg:red,bold>%TM-flag</>" +
+                               "<wrap-tail:,wrap-head:         ,wrap> </>" +
+                               "<wrap-margin><fg:#FF8C00-40>%TM-subject</></></>")
         self.add_notify(self.maindoc, "Notify:Tag")
         self.add_notify(self.maindoc, "Notify:Close")
         self['doc-status'] = ""

diff --git a/python/render-c-mode.py b/python/render-c-mode.py
index 716eeaabf310eabfaaeefd1f4b1540a0d2faf8bb..9e9ea1f50274726b1d5ac9d1b4c3ca01a09a08eb 100644 (file)
--- a/python/render-c-mode.py
+++ b/python/render-c-mode.py
@@ -143,6 +143,7 @@ class parse_state:
             else:
                 self.preproc_continue = (
                     c == '\\' and p.following(m) == '\n')
+        # FIXME c can be None here - maybe timeout
         if c not in ' \t':
             self.sol = c == '\n'