[PATCH v4 01/12] emacs: move tag format validation to `notmuch-tag' function

diff --git a/cb/f6fcb9c46f827c88afb83f2f6a9287417ebc6a b/cb/f6fcb9c46f827c88afb83f2f6a9287417ebc6a
new file mode 100644 (file)
index 0000000..7d73241
--- /dev/null
+++ b/cb/f6fcb9c46f827c88afb83f2f6a9287417ebc6a
@@ -0,0 +1,101 @@
+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 C1B2E421192\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 20:55:47 -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 6Q6QgVW4N34d for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Jan 2012 20:55:47 -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 12C5B431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 20:55:46 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id 11so2152468bke.26\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 20:55:46 -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:in-reply-to:references;\r
+       bh=8vCRF4eaWE31HhzbTFH5/b5zIqqo1QAuNM7SxxsSe6k=;\r
+       b=j8gUdwmUgAKLMMj5b9QiqYNKgwn6tbiEpHeMkjVHmDBSpjc2fTGjqt2quACNLbif2H\r
+       gIYHiKty8bpg7VRHtkMhGDzpveFlA9AMXXa9PAqRHsmhCNiLYGbpY2bw+iZv73uuHs6D\r
+       vuipIdAR0eJ4aY+N8x/ec86djAUP97iPTtk0k=\r
+Received: by 10.204.153.206 with SMTP id l14mr10138391bkw.3.1327985746734;\r
+       Mon, 30 Jan 2012 20:55:46 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id ga13sm42513337bkc.5.2012.01.30.20.55.45\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 30 Jan 2012 20:55:45 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 01/12] emacs: move tag format validation to `notmuch-tag'\r
+       function\r
+Date: Tue, 31 Jan 2012 08:54:15 +0400\r
+Message-Id: <1327985666-29191-2-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.9\r
+In-Reply-To: <1327985666-29191-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327901644-15799-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <1327985666-29191-1-git-send-email-dmitry.kurochkin@gmail.com>\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: Tue, 31 Jan 2012 04:55:48 -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.9\r
+\r