From: Dmitry Kurochkin Date: Tue, 31 Jan 2012 04:54:24 +0000 (+0400) Subject: [PATCH v4 10/12] emacs: accept empty tag list in `notmuch-tag' X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6f6790d19a16237de3f91efec7ca9ea4b94680a9;p=notmuch-archives.git [PATCH v4 10/12] emacs: accept empty tag list in `notmuch-tag' --- diff --git a/48/81e20869f8ab778b98a3bad4addffba5174324 b/48/81e20869f8ab778b98a3bad4addffba5174324 new file mode 100644 index 000000000..16eedeac4 --- /dev/null +++ b/48/81e20869f8ab778b98a3bad4addffba5174324 @@ -0,0 +1,95 @@ +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 9D573417330 + for ; Mon, 30 Jan 2012 20:56:41 -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 BmDp4TNTSiIk for ; + Mon, 30 Jan 2012 20:56:40 -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 9A8E7414B88 + for ; Mon, 30 Jan 2012 20:56:04 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so2152468bke.26 + for ; Mon, 30 Jan 2012 20:56:04 -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=LSlIcb49jefkLjlJI2oB0oAX2rS08P9BGXYYDIjhv0g=; + b=N7fbE9Vl46LiAy2q47l5kOMnbKgmM2MnCx92N7Hq3yJlR9Uj7hpx5pg6Lxr+gnDdOG + y8OUDa+OGc7keuKBAqVgf1jA2H5Snj8rbJ9weP44jhdQ9XWyD1Q1PclD+Zr/nQQzkCCf + m3GhrDHIX3LX09tvMim7Haw5UHZciPCQs2sg0= +Received: by 10.204.141.11 with SMTP id k11mr10064751bku.5.1327985764285; + Mon, 30 Jan 2012 20:56:04 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id bw9sm42482446bkb.8.2012.01.30.20.56.03 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 30 Jan 2012 20:56:03 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v4 10/12] emacs: accept empty tag list in `notmuch-tag' +Date: Tue, 31 Jan 2012 08:54:24 +0400 +Message-Id: <1327985666-29191-11-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.9 +In-Reply-To: <1327985666-29191-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327901644-15799-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327985666-29191-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: Tue, 31 Jan 2012 04:56:42 -0000 + +Since `notmuch-tag' is a non-interactive function and hence is meant +to be invoked programmatically, it should accept zero tags. Also, the +tagging operations (bound to "*", "+", "-") would accept empty input +without an error. +--- + emacs/notmuch.el | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 2332c42..c464c3c 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -554,15 +554,15 @@ messages instead of running (notmuch-call-notmuch-process \"tag\" ..) + directly, so that hooks specified in notmuch-before-tag-hook and + notmuch-after-tag-hook will be run." + ;; Perform some validation +- (when (null tags) (error "No tags given")) + (mapc (lambda (tag) + (unless (string-match-p "^[-+]\\S-+$" tag) + (error "Tag must be of the form `+this_tag' or `-that_tag'"))) + tags) +- (run-hooks 'notmuch-before-tag-hook) +- (apply 'notmuch-call-notmuch-process +- (append (list "tag") tags (list "--" query))) +- (run-hooks 'notmuch-after-tag-hook)) ++ (unless (null tags) ++ (run-hooks 'notmuch-before-tag-hook) ++ (apply 'notmuch-call-notmuch-process "tag" ++ (append tags (list "--" query))) ++ (run-hooks 'notmuch-after-tag-hook))) + + (defcustom notmuch-before-tag-hook nil + "Hooks that are run before tags of a message are modified. +-- +1.7.9 +