From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 6C6226DE0B7C for ; Mon, 12 Jun 2017 06:30:57 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.008 X-Spam-Level: X-Spam-Status: No, score=-0.008 tagged_above=-999 required=5 tests=[AWL=0.093, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uAB_iWz9Mqwz for ; Mon, 12 Jun 2017 06:30:56 -0700 (PDT) Received: from mail.choca.pics (mail.choca.pics [62.210.108.126]) by arlo.cworth.org (Postfix) with ESMTPS id 92A9F6DE092F for ; Mon, 12 Jun 2017 06:30:56 -0700 (PDT) Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 4C30C232C196; Mon, 12 Jun 2017 15:30:55 +0200 (CEST) Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id pAXsYCZvccyI; Mon, 12 Jun 2017 15:30:54 +0200 (CEST) Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 60EB0232C195; Mon, 12 Jun 2017 15:30:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.choca.pics 60EB0232C195 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cassou.me; s=9EA44F5C-DEF4-11E6-A83F-A08DF322D8FB; t=1497274254; bh=40yANzET3gJU4AecCeauwcViE/KU4Ve9Jbq3IHJkCy8=; h=From:To:Date:Message-Id; b=gmp1CvLc+Fb8Svhdd0nLBnewoxR8A47Bte2g9fNx6Mx+7Ip1iv77YriIADeBCgOUK O93/4ulPSjfnZ00XQJ1svBp2dkElKljg+Drmo5ek86Y8BMNC/kxnOY3BUtM4EZhAtP A39KQo/XLs0vyhQgsS9mBk93pTMWMCPYbQzu8ZHdoJyqwieyqgVk7+VpAo6SeNQOkl xl8v/mgRpQtVIJ11hmw3fdrvxzmGFPkM2tv4Otk0a6v7VGroC2Mo+WYiRUC88jiA3p yuKwzIiKHFtTVp9Lk/etcKJKYIPHE8I4VjOKCLPGdC+SlKNr9S889GUYdQkH1stYqz g1pY321Vj1jKA== X-Virus-Scanned: amavisd-new at choca.pics Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id 8xq935DQkYxY; Mon, 12 Jun 2017 15:30:54 +0200 (CEST) Received: from localhost.localdomain (31-211-216-84.customers.ownit.se [31.211.216.84]) by mail.choca.pics (Postfix) with ESMTPSA id C6654232C193; Mon, 12 Jun 2017 15:30:53 +0200 (CEST) From: Damien Cassou To: David Bremner , Damien Cassou , notmuch@notmuchmail.org Subject: [PATCH] Add Emacs' imenu support in notmuch-show and notmuch-search Date: Mon, 12 Jun 2017 15:30:10 +0200 Message-Id: <20170612133010.13579-2-damien@cassou.me> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170612133010.13579-1-damien@cassou.me> References: <87bmpuokl1.fsf@tethera.net> <20170612133010.13579-1-damien@cassou.me> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Mon, 12 Jun 2017 13:30:57 -0000 Emacs' major modes can facilitate navigation in their buffers by supporting Imenu. In such major modes, launching Imenu (M-x imenu) makes Emacs display a list of items (e.g., function definitions in a code buffer). Selecting an item from this list moves point to this item. This patch adds Imenu support to both notmuch-show and notmuch-search buffers: * in notmuch-show, Imenu will present a list of all messages in the currently visible thread; * in notmuch-search, Imenu will present a list of all messages in the search buffer. --- emacs/notmuch-show.el | 23 ++++++++++++++++++++++- emacs/notmuch.el | 27 ++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index e7c22da..0f157ec 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -1516,7 +1516,11 @@ \\{notmuch-show-mode-map}" (setq notmuch-buffer-refresh-function #'notmuch-show-refresh-view) (setq buffer-read-only t - truncate-lines t)) + truncate-lines t) + (setq imenu-prev-index-position-function + #'notmuch-show-imenu-prev-index-position-function) + (setq imenu-extract-index-name-function + #'notmuch-show-imenu-extract-index-name-function)) (defun notmuch-tree-from-show-current-query () "Call notmuch tree with the current query" @@ -2465,6 +2469,23 @@ (list (completing-read "Mime type to use (default text/plain): " (mailcap-mime-types) nil nil nil nil "text/plain"))) (notmuch-show-apply-to-current-part-handle #'notmuch-show--mm-display-part mime-type)) +(defun notmuch-show-imenu-prev-index-position-function () + "Move point to previous message in notmuch-show buffer. +This function is used as a value for +`imenu-prev-index-position-function'." + (if (bobp) + nil + (notmuch-show-previous-message) + t)) + +(defun notmuch-show-imenu-extract-index-name-function () + "Return imenu name for line at point. +This function is used as a value for +`imenu-extract-index-name-function'. Point should be at the +beginning of the line." + (back-to-indentation) + (buffer-substring-no-properties (point) (line-end-position))) + (provide 'notmuch-show) ;;; notmuch-show.el ends here diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 40b9fab..90af68e 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -374,7 +374,11 @@ (setq notmuch-buffer-refresh-function #'notmuch-search-refresh-view) (set (make-local-variable 'scroll-preserve-screen-position) t) (add-to-invisibility-spec (cons 'ellipsis t)) (setq truncate-lines t) - (setq buffer-read-only t)) + (setq buffer-read-only t) + (setq imenu-prev-index-position-function + #'notmuch-search-imenu-prev-index-position-function) + (setq imenu-extract-index-name-function + #'notmuch-search-imenu-extract-index-name-function)) (defun notmuch-search-get-result (&optional pos) "Return the result object for the thread at POS (or point). @@ -1094,8 +1098,8 @@ (bury-buffer)) ;; Find the first notmuch buffer. (setq first (loop for buffer in (buffer-list) - if (notmuch-interesting-buffer buffer) - return buffer)) + if (notmuch-interesting-buffer buffer) + return buffer)) (if first ;; If the first one we found is any other than the starting @@ -1104,6 +1108,23 @@ (unless (eq first start) (switch-to-buffer first)) (notmuch)))) +;;;; Imenu Support + +(defun notmuch-search-imenu-prev-index-position-function () + "Move point to previous message in notmuch-search buffer. +This function is used as a value for +`imenu-prev-index-position-function'." + (notmuch-search-previous-thread)) + +(defun notmuch-search-imenu-extract-index-name-function () + "Return imenu name for line at point. +This function is used as a value for +`imenu-extract-index-name-function'. Point should be at the +beginning of the line." + (let ((subject (notmuch-search-find-subject)) + (author (notmuch-search-find-authors))) + (format "%s (%s)" subject author))) + (setq mail-user-agent 'notmuch-user-agent) (provide 'notmuch) -- 2.9.4