From: Dmitry Kurochkin Date: Mon, 30 Jan 2012 02:26:17 +0000 (+0400) Subject: [PATCH v2 08/13] emacs: separate history for operations which accept single and multi... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2117e7b1e2af2fb9e2b4dd9e3a90abdc38ff89f0;p=notmuch-archives.git [PATCH v2 08/13] emacs: separate history for operations which accept single and multiple tags --- diff --git a/09/c46a581841186e3a40effceaf2f556d203ddb7 b/09/c46a581841186e3a40effceaf2f556d203ddb7 new file mode 100644 index 000000000..b143e6be0 --- /dev/null +++ b/09/c46a581841186e3a40effceaf2f556d203ddb7 @@ -0,0 +1,114 @@ +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 77204429E52 + for ; Sun, 29 Jan 2012 18:28:02 -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 bI2xY5EvWP-J for ; + Sun, 29 Jan 2012 18:28:01 -0800 (PST) +Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com + [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 3919E429E5B + for ; Sun, 29 Jan 2012 18:27:51 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so960260bke.26 + for ; Sun, 29 Jan 2012 18:27:51 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; + bh=gAlKgeckCO9dksbWIHV8TRRa5OpPO7JH2qsf2d2H2w0=; + b=csP8Mc+PbxwngnkatySnGIhq6erXBusBdiKAwBVfmejTUtmbcKJ4GvNqHGQDG1ti38 + YQyKCfdc9YEK8qLGwxCqwqUXiqRUSQOshMwCobJIeT18F2NtUBAE2snqlqtYNbmywgqo + 3PuiBbmx//dq6oKU/AJfh+lW6Gr77wWe7QEGM= +Received: by 10.205.131.13 with SMTP id ho13mr7829154bkc.58.1327890470974; + Sun, 29 Jan 2012 18:27:50 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id o26sm28043469bko.14.2012.01.29.18.27.50 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Jan 2012 18:27:50 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v2 08/13] emacs: separate history for operations which accept + single and multiple tags +Date: Mon, 30 Jan 2012 06:26:17 +0400 +Message-Id: <1327890382-548-9-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com> +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: Mon, 30 Jan 2012 02:28:03 -0000 + +Some tag-related operations accept a single tag without prefix +(`notmuch-select-tag-with-completion'), others accept multiple tags +prefixed with '+' or '-' (`notmuch-read-tag-changes'). Before the +change, both functions used a single default minibuffer history. This +is inconvenient because you have to skip options with incompatible +format when going through the history. The patch adds separate +history lists for the two functions. Note that functions that accept +the same input format (e.g. "+", "-", "*") share the history list as +before. +--- + emacs/notmuch.el | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 90627dc..5adcac5 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -76,6 +76,14 @@ For example: + (defvar notmuch-query-history nil + "Variable to store minibuffer history for notmuch queries") + ++(defvar notmuch-select-tag-history nil ++ "Variable to store minibuffer history for ++`notmuch-select-tag-with-completion' function.") ++ ++(defvar notmuch-read-tag-changes-history nil ++ "Variable to store minibuffer history for ++`notmuch-read-tag-changes' function.") ++ + (defun notmuch-tag-completions (&optional search-terms) + (split-string + (with-output-to-string +@@ -86,7 +94,7 @@ For example: + + (defun notmuch-select-tag-with-completion (prompt &rest search-terms) + (let ((tag-list (notmuch-tag-completions search-terms))) +- (completing-read prompt tag-list))) ++ (completing-read prompt tag-list nil nil nil 'notmuch-select-tag-history))) + + (defun notmuch-read-tag-changes (&optional initial-input &rest search-terms) + (let* ((all-tag-list (notmuch-tag-completions)) +@@ -106,7 +114,8 @@ For example: + (define-key map " " 'self-insert-command) + map))) + (delete "" (completing-read-multiple "Tags (+add -drop): " +- tag-list nil nil initial-input)))) ++ tag-list nil nil initial-input ++ 'notmuch-read-tag-changes-history)))) + + (defun notmuch-update-tags (tags tag-changes) + "Return a copy of TAGS with additions and removals from TAG-CHANGES. +-- +1.7.8.3 +