emacs: Fix the notmuch-search-authors-width variable.

This variable existed previously, but wasn't actually used for anything.

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 117a365803ff76f423dc869afb9b612bb9f9798f..439303a77d3a6d3b7de679f2facb7c9b97aefe59 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -1213,7 +1213,7 @@ matching this search term are shown if non-nil. "
          (notmuch-show-next-open-message))
       )))
 
          (notmuch-show-next-open-message))
       )))
 

-(defvar notmuch-search-authors-width 40
+(defvar notmuch-search-authors-width 20

   "Number of columns to use to display authors in a notmuch-search buffer.")
 
 (defvar notmuch-search-mode-map
   "Number of columns to use to display authors in a notmuch-search buffer.")
 
 (defvar notmuch-search-mode-map


@@ -1507,11 +1507,12 @@ This function advances the next thread when finished."
                           (authors-length (length authors))
                           (subject (match-string 5 string))
                           (tags (match-string 6 string)))
                           (authors-length (length authors))
                           (subject (match-string 5 string))
                           (tags (match-string 6 string)))

-                     (if (> authors-length 40)
-                         (set 'authors (concat (substring authors 0 (- 40 3)) "...")))
+                     (if (> authors-length notmuch-search-authors-width)
+                         (set 'authors (concat (substring authors 0 (- notmuch-search-authors-width 3)) "...")))

                      (goto-char (point-max))
                      (goto-char (point-max))

-                     (let ((beg (point-marker)))
-                       (insert (format "%s %-7s %-40s %s (%s)\n" date count authors subject tags))
+                     (let ((beg (point-marker))
+                           (format-string (format "%%s %%-7s %%-%ds %%s (%%s)\n" notmuch-search-authors-width)))
+                       (insert (format format-string date count authors subject tags))

                        (put-text-property beg (point-marker) 'notmuch-search-thread-id thread-id)
                        (put-text-property beg (point-marker) 'notmuch-search-authors authors)
                        (put-text-property beg (point-marker) 'notmuch-search-subject subject)
                        (put-text-property beg (point-marker) 'notmuch-search-thread-id thread-id)
                        (put-text-property beg (point-marker) 'notmuch-search-authors authors)
                        (put-text-property beg (point-marker) 'notmuch-search-subject subject)

diff --git a/lib/thread.cc b/lib/thread.cc
index ec80f8518b9ebe7856db7a5a78cea474baf53e9f..1c8b39d208bc89a780675da6f27f98de0b168b97 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -278,7 +278,6 @@ _notmuch_thread_create (void *ctx,
     }
 
     notmuch_query_destroy (thread_id_query);
     }
 
     notmuch_query_destroy (thread_id_query);

-

     for (messages = notmuch_query_search_messages (matched_query);
         notmuch_messages_valid (messages);
         notmuch_messages_move_to_next (messages))
     for (messages = notmuch_query_search_messages (matched_query);
         notmuch_messages_valid (messages);
         notmuch_messages_move_to_next (messages))