From 5ba9f74175c7119ecfc67f28270464acf9479cbd Mon Sep 17 00:00:00 2001 From: Dmitry Kurochkin Date: Mon, 30 Jan 2012 06:26:21 +0400 Subject: [PATCH] [PATCH v2 12/13] emacs: accept empty tag list in `notmuch-tag' --- 46/ff9eb120ecbdb0678f322922fbdc3df309d444 | 95 +++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 46/ff9eb120ecbdb0678f322922fbdc3df309d444 diff --git a/46/ff9eb120ecbdb0678f322922fbdc3df309d444 b/46/ff9eb120ecbdb0678f322922fbdc3df309d444 new file mode 100644 index 000000000..71e81fdd4 --- /dev/null +++ b/46/ff9eb120ecbdb0678f322922fbdc3df309d444 @@ -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 5BABE431FBC + for ; Sun, 29 Jan 2012 18:28:32 -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 l-0ztimkQMUy for ; + Sun, 29 Jan 2012 18:28:31 -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 EC93B421189 + for ; Sun, 29 Jan 2012 18:27:58 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so960260bke.26 + for ; Sun, 29 Jan 2012 18:27:58 -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=OK0Sm2NBMtyTBG2LqvCWVI2W5QUQOcJU9gqHoAofFEs=; + b=WAEx6/9IgCTG4rCVgcmgDM9u4YqqbBG82U/wHne7rf/Fu3AeD7QOHUxJpLyiYqhbd1 + W8BzHveH9pJ4uilaG5sfzbqPeWVs6m1L4bdApu2stBDkEDU1aGUrjlqNkEz/ov87Qc+f + oAc2/0IVXa7eFk7CPdwxnJBw0Pjj7JmT7ZDjs= +Received: by 10.204.152.15 with SMTP id e15mr7762044bkw.108.1327890478716; + Sun, 29 Jan 2012 18:27:58 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id z15sm31387095bkd.7.2012.01.29.18.27.57 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Jan 2012 18:27:58 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v2 12/13] emacs: accept empty tag list in `notmuch-tag' +Date: Mon, 30 Jan 2012 06:26:21 +0400 +Message-Id: <1327890382-548-13-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:32 -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 7e8f185..1b7a835 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -555,15 +555,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 + -- 2.26.2