From: Dmitry Kurochkin Date: Mon, 30 Jan 2012 05:34:02 +0000 (+0400) Subject: [PATCH v3 10/12] emacs: accept empty tag list in `notmuch-tag' X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f65f3f5251e62b59229ff066ece503bd995c7629;p=notmuch-archives.git [PATCH v3 10/12] emacs: accept empty tag list in `notmuch-tag' --- diff --git a/db/bf56e113ea3042e0d2843f1f1f6c57178022fc b/db/bf56e113ea3042e0d2843f1f1f6c57178022fc new file mode 100644 index 000000000..5c55de4d1 --- /dev/null +++ b/db/bf56e113ea3042e0d2843f1f1f6c57178022fc @@ -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 826D4421166 + for ; Sun, 29 Jan 2012 21:36:09 -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 0UWuFoCM+j-l for ; + Sun, 29 Jan 2012 21:36:07 -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 AF7EA42119E + for ; Sun, 29 Jan 2012 21:35:35 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so1052482bke.26 + for ; Sun, 29 Jan 2012 21:35:35 -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=mILkKF1tAooB48ry02tQnQfXPSoYzQo3tnTNoh2I3OU=; + b=obCDJWug72RxsBXMYxoGmGpNzdUe/xoEW6lce00pdMlnIBCIGmYQTYodroiAk06zG3 + 3x/3s4ZoW5iZbPoay3cefD4q3dKKCEdh5SYGz2GoK3g3Oe4fYIQbXXdQI0bEqvBpMjB5 + Uv2aHFm2qzjOlYTYZJERNuu7BAoLJZtkByNms= +Received: by 10.204.152.15 with SMTP id e15mr7969088bkw.108.1327901735462; + Sun, 29 Jan 2012 21:35:35 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id ek9sm35151326bkb.10.2012.01.29.21.35.34 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Jan 2012 21:35:34 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v3 10/12] emacs: accept empty tag list in `notmuch-tag' +Date: Mon, 30 Jan 2012 09:34:02 +0400 +Message-Id: <1327901644-15799-11-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1327901644-15799-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327901644-15799-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 05:36:10 -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.8.3 +