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

diff --git a/de/9755aa7a7a0082b50f1288f2fe07abfe0e0b3d b/de/9755aa7a7a0082b50f1288f2fe07abfe0e0b3d
new file mode 100644 (file)
index 0000000..8f75fc5
--- /dev/null
+++ b/de/9755aa7a7a0082b50f1288f2fe07abfe0e0b3d
@@ -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 F2508431FCF\r
+       for <notmuch@notmuchmail.org>; Sat,  4 Feb 2012 23:15:24 -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 vEAk6JBajx81 for <notmuch@notmuchmail.org>;\r
+       Sat,  4 Feb 2012 23:15:23 -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 65D7A431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  4 Feb 2012 23:15:19 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id 11so4650313bke.26\r
+       for <notmuch@notmuchmail.org>; Sat, 04 Feb 2012 23:15:19 -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=VT54Wx+myH9hUHqa9/Ghcy1jnYED6cU9qVDiuTO5SHE=;\r
+       b=ENjFUqRa1HoXwLVxLYGGKzRMcO4hdvYxcMGa+UN6EZDNmmL/Dw81IgK+uhdbPX8Xqr\r
+       Az2igpUw/GKuagrrXJOo14or5+fnEoEgZV2WgUZtZ5PHB/nD5nf86g5GCfV/hPRBeobG\r
+       +IOQzoexDCKPzqWXboFagVKWUdwTkKr4e6gXE=\r
+Received: by 10.204.136.220 with SMTP id s28mr6431609bkt.59.1328426119055;\r
+       Sat, 04 Feb 2012 23:15:19 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id bw9sm33010162bkb.8.2012.02.04.23.15.17\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 04 Feb 2012 23:15:18 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 01/12] emacs: move tag format validation to `notmuch-tag'\r
+       function\r
+Date: Sun,  5 Feb 2012 11:13:42 +0400\r
+Message-Id: <1328426033-21480-2-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.9\r
+In-Reply-To: <1328426033-21480-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <1328426033-21480-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: Sun, 05 Feb 2012 07:15:25 -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 cd04ffd..19206db 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -516,6 +516,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
+@@ -883,12 +889,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