From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id BF20E431FBD for ; Thu, 13 Dec 2012 05:09:40 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xyD+231TolUk for ; Thu, 13 Dec 2012 05:09:39 -0800 (PST) Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id ACEA5431FBC for ; Thu, 13 Dec 2012 05:09:38 -0800 (PST) Received: by mail-wg0-f47.google.com with SMTP id dq11so771129wgb.2 for ; Thu, 13 Dec 2012 05:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=qn4YEP6Hz7JoLlL2CrL0eJmvxXOsKEnld4YFdbhkm8E=; b=ufHHkPi9mfMLB6QEnDYfqaS+T5dW1XJyZPc1ZtJzy/yduF1Wn7z9nxOuM0jhuZT5s1 oGNJaykTWRoxCaBdtEKhXw48qbUBvHDos/Uy0CTXCNJ7cxjKFZO65c6KO/yeFqbnoNP9 Bc6m+km1OoeSntwjsh5JL+8oVp/KB+7RjqdMEmEmHPPGHxW6/nf3BXbUABaiObaYG5M2 UPt24CqKdq2wYF/aZjS4zPWyqR2GHty/R7QkHKPjiUUU0jK0J1tmDbrC+MOth4/BpASQ J1yvBPKvjiBj7C/XRwrtRz43Y7DC0ctF0JI2ROGYZnexNZfhCxHTyLMIcN1lxJ0cvQP1 Sc/A== Received: by 10.180.93.40 with SMTP id cr8mr28902880wib.15.1355404177458; Thu, 13 Dec 2012 05:09:37 -0800 (PST) Received: from luz3.lille.inria.fr ([193.51.236.232]) by mx.google.com with ESMTPS id bz12sm2504214wib.5.2012.12.13.05.09.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 05:09:36 -0800 (PST) From: Damien Cassou To: notmuch@notmuchmail.org Subject: [PATCH 1/4] emacs: Add a thread's tags to notmuch-show header-line Date: Thu, 13 Dec 2012 14:09:24 +0100 Message-Id: <1355404167-31750-2-git-send-email-damien.cassou@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355404167-31750-1-git-send-email-damien.cassou@gmail.com> References: <1355404167-31750-1-git-send-email-damien.cassou@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2012 13:09:41 -0000 Signed-off-by: Damien Cassou --- emacs/notmuch-lib.el | 11 +++++++++-- emacs/notmuch-show.el | 37 +++++++++++++++++++++++++++++-------- emacs/notmuch-tagger.el | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 emacs/notmuch-tagger.el diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 9c4ee71..3541bb7 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -603,8 +603,15 @@ left it." ;; Clear out what we've parsed (delete-region (point-min) (point)))) - - +(defun notmuch-intersperse (list sep) + "Return a list with all elements of LIST separated by SEP." + (let ((first t) + (res nil)) + (dolist (elt list (nreverse res)) + (unless first + (push sep res)) + (setq first nil) + (push elt res)))) (provide 'notmuch-lib) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 7d9f8a9..9c5a85e 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -36,6 +36,7 @@ (require 'notmuch-mua) (require 'notmuch-crypto) (require 'notmuch-print) +(require 'notmuch-tagger) (declare-function notmuch-call-notmuch-process "notmuch" (&rest args)) (declare-function notmuch-fontify-headers "notmuch" nil) @@ -355,7 +356,7 @@ operation on the contents of the current buffer." "Return a string comprised of `n' spaces." (make-string n ? )) -(defun notmuch-show-update-tags (tags) +(defun notmuch-show-update-tags (tags &optional no-headerline-update) "Update the displayed tags of the current message." (save-excursion (goto-char (notmuch-show-message-top)) @@ -364,7 +365,9 @@ operation on the contents of the current buffer." (replace-match (concat "(" (propertize (mapconcat 'identity tags " ") 'face 'notmuch-tag-face) - ")")))))) + ")"))))) + (unless no-headerline-update + (notmuch-show-update-header-line))) (defun notmuch-clean-address (address) "Try to clean a single email ADDRESS for display. Return a cons @@ -1136,11 +1139,28 @@ function is used." (jit-lock-register #'notmuch-show-buttonise-links) - ;; Set the header line to the subject of the first message. - (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-subject))) - + (notmuch-show-update-header-line) (run-hooks 'notmuch-show-hook)))) +(defun notmuch-show-thread-tags () + "Return the list of tags for the current thread." + (let ((tags (list))) + (notmuch-show-mapc (lambda () + (mapcar (lambda (elt) + ;; Avoid adding duplicate tags + (add-to-list 'tags elt)) + (notmuch-show-get-tags)))) + (sort tags 'string<))) + +(defun notmuch-show-update-header-line () + "Make the header-line show the thread's subject and tags." + (let ((thread-subject (notmuch-show-strip-re (notmuch-show-get-subject)))) + (setq header-line-format + (list + thread-subject + " " + (notmuch-tagger-format-tags-header-line (notmuch-show-thread-tags)))))) + (defun notmuch-show-capture-state () "Capture the state of the current buffer. @@ -1443,10 +1463,10 @@ current thread." (defun notmuch-show-get-depth () (notmuch-show-get-prop :depth)) -(defun notmuch-show-set-tags (tags) +(defun notmuch-show-set-tags (tags &optional no-headerline-update) "Set the tags of the current message." (notmuch-show-set-prop :tags tags) - (notmuch-show-update-tags tags)) + (notmuch-show-update-tags tags no-headerline-update)) (defun notmuch-show-get-tags () "Return the tags of the current message." @@ -1760,7 +1780,8 @@ See `notmuch-tag' for information on the format of TAG-CHANGES." (let* ((current-tags (notmuch-show-get-tags)) (new-tags (notmuch-update-tags current-tags tag-changes))) (unless (equal current-tags new-tags) - (notmuch-show-set-tags new-tags)))))) + (notmuch-show-set-tags new-tags t))))) + (notmuch-show-update-header-line)) (defun notmuch-show-add-tag () "Same as `notmuch-show-tag' but sets initial input to '+'." diff --git a/emacs/notmuch-tagger.el b/emacs/notmuch-tagger.el new file mode 100644 index 0000000..6fcebff --- /dev/null +++ b/emacs/notmuch-tagger.el @@ -0,0 +1,35 @@ +;; notmuch-tagger.el --- Library to improve the way tags are displayed +;; +;; Copyright © Damien Cassou +;; +;; This file is part of Notmuch. +;; +;; Notmuch is free software: you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Notmuch is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Notmuch. If not, see . +;; +;; Authors: Damien Cassou +;;; Commentary: +;; +;;; Code: +;; + +(defun notmuch-tagger-format-tags-header-line (tags) + "Format TAGS as a `mode-line-format' template. +The result is suitable for inclusion in `header-line-format'." + (list + "(" + (notmuch-intersperse tags " ") + ")")) + +(provide 'notmuch-tagger) +;;; notmuch-tagger.el ends here -- 1.7.10.4