From 15ebfef4a40d9b80d1a3dad2c4ab6b7566744338 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 3 Jun 2013 11:29:17 +2100 Subject: [PATCH] [PATCH] emacs: add `notmuch-archive-tags' cross references in docstrings --- ee/f5d00b70aab5fe84ecb276bf67ac06c0ec5121 | 124 ++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 ee/f5d00b70aab5fe84ecb276bf67ac06c0ec5121 diff --git a/ee/f5d00b70aab5fe84ecb276bf67ac06c0ec5121 b/ee/f5d00b70aab5fe84ecb276bf67ac06c0ec5121 new file mode 100644 index 000000000..ca48d3285 --- /dev/null +++ b/ee/f5d00b70aab5fe84ecb276bf67ac06c0ec5121 @@ -0,0 +1,124 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id E4D18429E4C + for ; Sun, 2 Jun 2013 07:29:51 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] 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 oajxg3-LtJen for ; + Sun, 2 Jun 2013 07:29:44 -0700 (PDT) +Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 39074429E40 + for ; Sun, 2 Jun 2013 07:29:44 -0700 (PDT) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id r52ETbYj018387; + Sun, 2 Jun 2013 11:29:37 -0300 +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) + (envelope-from ) + id 1Uj9Hs-0006h3-SO; Sun, 02 Jun 2013 11:29:37 -0300 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Uj9Hn-0006wY-9F; Sun, 02 Jun 2013 11:29:31 -0300 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH] emacs: add `notmuch-archive-tags' cross references in + docstrings +Date: Sun, 2 Jun 2013 11:29:17 -0300 +Message-Id: <1370183357-26653-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.2.rc2 +In-Reply-To: <1370181885-23021-1-git-send-email-david@tethera.net> +References: <1370181885-23021-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +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: Sun, 02 Jun 2013 14:29:52 -0000 + +From: David Bremner + +Several function docstrings refer to behaviour in docstrings that is +really controlled by notmuch-archive-tags. Add cross references, and +replace hardcoding. +--- + emacs/notmuch-show.el | 4 ++-- + emacs/notmuch.el | 27 ++++++++++++++++----------- + 2 files changed, 18 insertions(+), 13 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 600e802..c281f05 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1529,8 +1529,8 @@ This command is intended to be one of the simplest ways to + process a thread of email. It works exactly like + notmuch-show-advance, in that it scrolls through messages in a + show buffer, except that when it gets to the end of the buffer it +-archives the entire current thread, (remove the \"inbox\" tag +-from each message), kills the buffer, and displays the next ++archives the entire current thread, (apply changes in ++`notmuch-archive-tags'), kills the buffer, and displays the next + thread from the search from which this thread was originally + shown." + (interactive) +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 5a8c957..e78334d 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -386,17 +386,22 @@ number of matched messages and total messages in the thread, + participants in the thread, a representative subject line, and + any tags). + +-Pressing \\[notmuch-search-show-thread] on any line displays that thread. The '\\[notmuch-search-add-tag]' and '\\[notmuch-search-remove-tag]' +-keys can be used to add or remove tags from a thread. The '\\[notmuch-search-archive-thread]' key +-is a convenience for archiving a thread (removing the \"inbox\" +-tag). The '\\[notmuch-search-tag-all]' key can be used to add and/or remove tags from all +-messages (as opposed to threads) that match the current query. Use with caution, as this +-will also tag matching messages that arrived *after* constructing the buffer. +- +-Other useful commands are '\\[notmuch-search-filter]' for filtering the current search +-based on an additional query string, '\\[notmuch-search-filter-by-tag]' for filtering to include +-only messages with a given tag, and '\\[notmuch-search]' to execute a new, global +-search. ++Pressing \\[notmuch-search-show-thread] on any line displays that ++thread. The '\\[notmuch-search-add-tag]' and ++'\\[notmuch-search-remove-tag]' keys can be used to add or remove ++tags from a thread. The '\\[notmuch-search-archive-thread]' key ++is a convenience for archiving a thread (applying changes in ++`notmuch-archive-tags'). The '\\[notmuch-search-tag-all]' key can ++be used to add and/or remove tags from all messages (as opposed ++to threads) that match the current query. Use with caution, as ++this will also tag matching messages that arrived *after* ++constructing the buffer. ++ ++Other useful commands are '\\[notmuch-search-filter]' for ++filtering the current search based on an additional query string, ++'\\[notmuch-search-filter-by-tag]' for filtering to include only ++messages with a given tag, and '\\[notmuch-search]' to execute a ++new, global search. + + Complete list of currently available key bindings: + +-- +1.8.2.rc2 + -- 2.26.2