[PATCH 1/6] emacs: move tag format validation to `notmuch-tag' function

diff --git a/ec/2e1713965437b7fb712ff61e13e72d09a937d8 b/ec/2e1713965437b7fb712ff61e13e72d09a937d8
new file mode 100644 (file)
index 0000000..6d10492
--- /dev/null
+++ b/ec/2e1713965437b7fb712ff61e13e72d09a937d8
@@ -0,0 +1,98 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 92144431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:34 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id HBBixff85ZK1 for <notmuch@notmuchmail.org>;\r
+       Fri, 27 Jan 2012 20:42:34 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DD1BC431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:33 -0800 (PST)\r
+Received: by bkbzt19 with SMTP id zt19so2255515bkb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:32 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:date:message-id:x-mailer;\r
+       bh=tCONDe2BxG39qitT55xnR3sf2CKcETDyKuEOgGI3z7A=;\r
+       b=ZU6nsk67uTZWgv2pLeTdwi3k+QXMHPnbsri/TJMBYKhNEpZVo419faFteckXF0XolP\r
+       aPJ08D5oV7eHUlFmp5IZGWumD5O2bKDsI5v5oUmfIK2Bh0qr7qR4EbJffxTwZYnveuBX\r
+       vg9hkX5kHrw1pUOyCG7k0Eas2sLc2T0APNCNg=\r
+Received: by 10.204.151.3 with SMTP id a3mr2209517bkw.34.1327725752498;\r
+       Fri, 27 Jan 2012 20:42:32 -0800 (PST)\r
+Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id\r
+       ci12sm20644890bkb.13.2012.01.27.20.42.31\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 27 Jan 2012 20:42:32 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/6] emacs: move tag format validation to `notmuch-tag'\r
+       function\r
+Date: Sat, 28 Jan 2012 08:41:19 +0400\r
+Message-Id: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.8.3\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 Jan 2012 04:42:34 -0000\r
+\r
+Before the change, tag format validation was done in\r
+`notmuch-search-operate-all' function only.  The patch moves it down\r
+to `notmuch-tag', so that all users of that function get input\r
+validation.\r
+---\r
+ emacs/notmuch.el |   12 ++++++------\r
+ 1 files changed, 6 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 72f78ed..84d7d0a 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -522,6 +522,12 @@ Note: Other code should always use this function alter tags of\r
+ messages instead of running (notmuch-call-notmuch-process \"tag\" ..)\r
+ directly, so that hooks specified in notmuch-before-tag-hook and\r
+ notmuch-after-tag-hook will be run."\r
++  ;; Perform some validation\r
++  (when (null tags) (error "No tags given"))\r
++  (mapc (lambda (tag)\r
++        (unless (string-match-p "^[-+][-+_.[:word:]]+$" tag)\r
++          (error "Tag must be of the form `+this_tag' or `-that_tag'")))\r
++      tags)\r
+   (run-hooks 'notmuch-before-tag-hook)\r
+   (apply 'notmuch-call-notmuch-process\r
+        (append (list "tag") tags (list "--" query)))\r
+@@ -890,12 +896,6 @@ characters as well as `_.+-'.\r
+   (interactive (notmuch-select-tags-with-completion\r
+               "Operations (+add -drop): notmuch tag "\r
+               '("+" "-")))\r
+-  ;; Perform some validation\r
+-  (when (null actions) (error "No operations given"))\r
+-  (mapc (lambda (action)\r
+-        (unless (string-match-p "^[-+][-+_.[:word:]]+$" action)\r
+-          (error "Action must be of the form `+this_tag' or `-that_tag'")))\r
+-      actions)\r
+   (apply 'notmuch-tag notmuch-search-query-string actions))\r
+ \r
+ (defun notmuch-search-buffer-title (query)\r
+-- \r
+1.7.8.3\r
+\r