From 65f56aafe919bfc383235ece807a8607c69f830d Mon Sep 17 00:00:00 2001 From: Dmitry Kurochkin Date: Sun, 5 Feb 2012 11:13:51 +0400 Subject: [PATCH] [PATCH v5 10/12] emacs: accept empty tag list in `notmuch-tag' --- b6/59b9cf63df348b312be75ba7df5ea9a763b975 | 95 +++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 b6/59b9cf63df348b312be75ba7df5ea9a763b975 diff --git a/b6/59b9cf63df348b312be75ba7df5ea9a763b975 b/b6/59b9cf63df348b312be75ba7df5ea9a763b975 new file mode 100644 index 000000000..3e8fc4167 --- /dev/null +++ b/b6/59b9cf63df348b312be75ba7df5ea9a763b975 @@ -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 41D29431FC3 + for ; Sat, 4 Feb 2012 23:15:48 -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 qywGvjbbv9MR for ; + Sat, 4 Feb 2012 23:15:47 -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 B174B431FDA + for ; Sat, 4 Feb 2012 23:15:37 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so4650313bke.26 + for ; Sat, 04 Feb 2012 23:15:37 -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=cc9HGiaBDJonFn8aJVMf+vFsQyM/q1awPQnQGbBlod0=; + b=RuWH4pT6Q1zsszS0av9vKYGupjskNLPArF/woknjlRfqy5lW+WZkTlhHW+Wo9D3uOx + gv+/1esQuvVnTNZ1zkUhyw5ndWvJXwCaQHPDczoHndxFtL8Bv+2i3GWmzQWuaXuX1JfA + 0ep1wNvv+tpSildC2QKkSu85z1jq0lhDN9x/g= +Received: by 10.204.10.73 with SMTP id o9mr6134900bko.99.1328426137370; + Sat, 04 Feb 2012 23:15:37 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id ez5sm32952883bkc.15.2012.02.04.23.15.36 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 04 Feb 2012 23:15:37 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v5 10/12] emacs: accept empty tag list in `notmuch-tag' +Date: Sun, 5 Feb 2012 11:13:51 +0400 +Message-Id: <1328426033-21480-11-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.9 +In-Reply-To: <1328426033-21480-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1328426033-21480-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: Sun, 05 Feb 2012 07:15:49 -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 b06d8a1..0ffdf9c 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -548,15 +548,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 + -- 2.26.2