From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH v3 1/9] emacs: Clean up notmuch-search-show-result
Date: Mon, 9 Jul 2012 17:42:34 -0400 [thread overview]
Message-ID: <1341870162-17782-2-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1341870162-17782-1-git-send-email-amdragon@mit.edu>
This simplifies the code and makes it no longer cubic in the number of
result fields.
---
emacs/notmuch.el | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index c6236db..8ad0b68 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -707,29 +707,30 @@ non-authors is found, assume that all of the authors match."
(overlay-put overlay 'isearch-open-invisible #'delete-overlay)))
(insert padding))))
-(defun notmuch-search-insert-field (field date count authors subject tags)
+(defun notmuch-search-insert-field (field format-string date count authors subject tags)
(cond
((string-equal field "date")
- (insert (propertize (format (cdr (assoc field notmuch-search-result-format)) date)
+ (insert (propertize (format format-string date)
'face 'notmuch-search-date)))
((string-equal field "count")
- (insert (propertize (format (cdr (assoc field notmuch-search-result-format)) count)
+ (insert (propertize (format format-string count)
'face 'notmuch-search-count)))
((string-equal field "subject")
- (insert (propertize (format (cdr (assoc field notmuch-search-result-format)) subject)
+ (insert (propertize (format format-string subject)
'face 'notmuch-search-subject)))
((string-equal field "authors")
- (notmuch-search-insert-authors (cdr (assoc field notmuch-search-result-format)) authors))
+ (notmuch-search-insert-authors format-string authors))
((string-equal field "tags")
+ ;; Ignore format-string here because notmuch-search-set-tags
+ ;; depends on the format of this
(insert (concat "(" (propertize tags 'font-lock-face 'notmuch-tag-face) ")")))))
(defun notmuch-search-show-result (date count authors subject tags)
- (let ((fields) (field))
- (setq fields (mapcar 'car notmuch-search-result-format))
- (loop for field in fields
- do (notmuch-search-insert-field field date count authors subject tags)))
+ (dolist (spec notmuch-search-result-format)
+ (notmuch-search-insert-field (car spec) (cdr spec)
+ date count authors subject tags))
(insert "\n"))
(defun notmuch-search-process-filter (proc string)
--
1.7.10
next prev parent reply other threads:[~2012-07-09 21:42 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-03 22:20 [PATCH 0/8] JSON-based search-mode Austin Clements
2012-07-03 22:20 ` [PATCH 1/8] emacs: Clean up notmuch-search-show-result Austin Clements
2012-07-04 7:53 ` Mark Walters
2012-07-04 16:22 ` Austin Clements
2012-07-04 16:31 ` Tomi Ollila
2012-07-04 20:47 ` Mark Walters
2012-07-04 21:00 ` Austin Clements
2012-07-03 22:20 ` [PATCH 2/8] emacs: Separate search line parsing and display Austin Clements
2012-07-03 22:20 ` [PATCH 3/8] emacs: Move search-target logic to `notmuch-search-show-result' Austin Clements
2012-07-04 8:34 ` Mark Walters
2012-07-04 16:17 ` Austin Clements
2012-07-03 22:20 ` [PATCH 4/8] emacs: Helper for reporting search parsing errors Austin Clements
2012-07-04 8:41 ` Mark Walters
2012-07-03 22:20 ` [PATCH 5/8] emacs: Pass plist to `notmuch-search-show-result' Austin Clements
2012-07-03 22:20 ` [PATCH 6/8] test: New test for incremental search output parsing Austin Clements
2012-07-03 22:20 ` [PATCH 7/8] emacs: Implement an incremental JSON parser Austin Clements
2012-07-05 8:30 ` Mark Walters
2012-07-05 18:36 ` Austin Clements
2012-07-03 22:20 ` [PATCH 8/8] emacs: Switch from text to JSON format for search results Austin Clements
2012-07-05 8:37 ` Mark Walters
2012-07-05 18:58 ` Austin Clements
2012-07-04 16:37 ` [PATCH 0/8] JSON-based search-mode Tomi Ollila
2012-07-05 20:52 ` [PATCH v2 0/9] " Austin Clements
2012-07-05 20:52 ` [PATCH v2 1/9] emacs: Clean up notmuch-search-show-result Austin Clements
2012-07-05 20:52 ` [PATCH v2 2/9] emacs: Separate search line parsing and display Austin Clements
2012-07-05 20:52 ` [PATCH v2 3/9] emacs: Helper for reporting search parsing errors Austin Clements
2012-07-05 20:52 ` [PATCH v2 4/9] emacs: Move search-target logic to `notmuch-search-show-result' Austin Clements
2012-07-05 20:52 ` [PATCH v2 5/9] emacs: Pass plist " Austin Clements
2012-07-05 20:52 ` [PATCH v2 6/9] test: New test for incremental search output parsing Austin Clements
2012-07-05 20:52 ` [PATCH v2 7/9] emacs: Implement an incremental JSON parser Austin Clements
2012-07-05 20:52 ` [PATCH v2 8/9] emacs: Switch from text to JSON format for search results Austin Clements
2012-07-05 20:52 ` [PATCH v2 9/9] News for JSON-based search Austin Clements
2012-07-05 21:44 ` [PATCH v2 0/9] JSON-based search-mode Mark Walters
2012-07-06 0:29 ` Austin Clements
2012-07-07 16:27 ` Mark Walters
2012-07-09 21:42 ` [PATCH v3 " Austin Clements
2012-07-09 21:42 ` Austin Clements [this message]
2012-07-13 3:14 ` [PATCH v3 1/9] emacs: Clean up notmuch-search-show-result David Bremner
2012-07-09 21:42 ` [PATCH v3 2/9] emacs: Separate search line parsing and display Austin Clements
2012-07-09 21:42 ` [PATCH v3 3/9] emacs: Helper for reporting search parsing errors Austin Clements
2012-07-09 21:42 ` [PATCH v3 4/9] emacs: Move search-target logic to `notmuch-search-show-result' Austin Clements
2012-07-09 21:42 ` [PATCH v3 5/9] emacs: Pass plist " Austin Clements
2012-07-09 21:42 ` [PATCH v3 6/9] test: New test for incremental search output parsing Austin Clements
2012-07-09 21:42 ` [PATCH v3 7/9] emacs: Implement an incremental JSON parser Austin Clements
2012-07-09 21:42 ` [PATCH v3 8/9] emacs: Switch from text to JSON format for search results Austin Clements
2012-07-09 21:42 ` [PATCH v3 9/9] News for JSON-based search Austin Clements
2012-07-11 6:55 ` [PATCH v3 0/9] JSON-based search-mode Mark Walters
2012-07-11 8:48 ` Tomi Ollila
2012-07-21 17:37 ` [PATCH v4 0/8] emacs: JSON-based search cleanups Austin Clements
2012-07-21 17:37 ` [PATCH v4 1/8] emacs: Record thread search result object in a text property Austin Clements
2012-07-21 17:37 ` [PATCH v4 2/8] emacs: Use text properties instead of overlays for tag coloring Austin Clements
2012-07-21 17:37 ` [PATCH v4 3/8] emacs: Update tags by rewriting the search result line in place Austin Clements
2012-07-21 17:37 ` [PATCH v4 4/8] emacs: Use result text properties for search result iteration Austin Clements
2012-07-21 17:37 ` [PATCH v4 5/8] emacs: Replace other search text properties with result property Austin Clements
2012-07-21 17:37 ` [PATCH v4 6/8] emacs: Allow custom tags formatting Austin Clements
2012-07-21 17:37 ` [PATCH v4 7/8] emacs: Fix navigation of multi-line search result formats Austin Clements
2012-08-02 6:51 ` Jani Nikula
2012-08-02 7:19 ` [PATCH] emacs: fix a bug introduced by the recent search cleanups Mark Walters
2012-08-02 7:59 ` Jani Nikula
2012-08-02 14:22 ` Austin Clements
2012-08-03 1:00 ` David Bremner
2012-07-21 17:37 ` [PATCH v4 8/8] News for " Austin Clements
2012-07-21 17:56 ` [PATCH v4 0/8] emacs: JSON-based " Austin Clements
2012-07-22 15:27 ` Mark Walters
2012-07-22 18:45 ` Jameson Graef Rollins
2012-07-24 12:34 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341870162-17782-2-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).