1 Return-Path: <dmitry.kurochkin@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 4A315431E64
\r
6 for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:27:39 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id PiawXmOJRVC6 for <notmuch@notmuchmail.org>;
\r
17 Sun, 29 Jan 2012 18:27:38 -0800 (PST)
\r
18 Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com
\r
19 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id A454B431FD2
\r
22 for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:27:38 -0800 (PST)
\r
23 Received: by bke11 with SMTP id 11so960274bke.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:27:37 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=tCONDe2BxG39qitT55xnR3sf2CKcETDyKuEOgGI3z7A=;
\r
28 b=Vfa+3SRG/wLh7PxG9+9DOB4tW/2JGJRHFnNN8++7vMDbrwsYv+rZbCqHBoRMubN6rf
\r
29 LtCbUqSJ4Tb3iog9Z5qa+Cy2cRmw4ezDgQy8LKI8NxVI0OUUR+JNYbQ/1AKPX+j7qxlN
\r
30 Gc2BOQEa8m/6UOYYbyr5HOgG3G+L4DIi4Xt8U=
\r
31 Received: by 10.204.10.73 with SMTP id o9mr7370443bko.99.1327890457378;
\r
32 Sun, 29 Jan 2012 18:27:37 -0800 (PST)
\r
33 Received: from localhost ([91.144.186.21])
\r
34 by mx.google.com with ESMTPS id z15sm31385347bkd.7.2012.01.29.18.27.36
\r
35 (version=TLSv1/SSLv3 cipher=OTHER);
\r
36 Sun, 29 Jan 2012 18:27:36 -0800 (PST)
\r
37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH v2 01/13] emacs: move tag format validation to `notmuch-tag'
\r
41 Date: Mon, 30 Jan 2012 06:26:10 +0400
\r
42 Message-Id: <1327890382-548-2-git-send-email-dmitry.kurochkin@gmail.com>
\r
43 X-Mailer: git-send-email 1.7.8.3
\r
44 In-Reply-To: <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
45 References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
46 <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
47 X-BeenThere: notmuch@notmuchmail.org
\r
48 X-Mailman-Version: 2.1.13
\r
50 List-Id: "Use and development of the notmuch mail system."
\r
51 <notmuch.notmuchmail.org>
\r
52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
55 List-Post: <mailto:notmuch@notmuchmail.org>
\r
56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
59 X-List-Received-Date: Mon, 30 Jan 2012 02:27:39 -0000
\r
61 Before the change, tag format validation was done in
\r
62 `notmuch-search-operate-all' function only. The patch moves it down
\r
63 to `notmuch-tag', so that all users of that function get input
\r
66 emacs/notmuch.el | 12 ++++++------
\r
67 1 files changed, 6 insertions(+), 6 deletions(-)
\r
69 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
70 index 72f78ed..84d7d0a 100644
\r
71 --- a/emacs/notmuch.el
\r
72 +++ b/emacs/notmuch.el
\r
73 @@ -522,6 +522,12 @@ Note: Other code should always use this function alter tags of
\r
74 messages instead of running (notmuch-call-notmuch-process \"tag\" ..)
\r
75 directly, so that hooks specified in notmuch-before-tag-hook and
\r
76 notmuch-after-tag-hook will be run."
\r
77 + ;; Perform some validation
\r
78 + (when (null tags) (error "No tags given"))
\r
79 + (mapc (lambda (tag)
\r
80 + (unless (string-match-p "^[-+][-+_.[:word:]]+$" tag)
\r
81 + (error "Tag must be of the form `+this_tag' or `-that_tag'")))
\r
83 (run-hooks 'notmuch-before-tag-hook)
\r
84 (apply 'notmuch-call-notmuch-process
\r
85 (append (list "tag") tags (list "--" query)))
\r
86 @@ -890,12 +896,6 @@ characters as well as `_.+-'.
\r
87 (interactive (notmuch-select-tags-with-completion
\r
88 "Operations (+add -drop): notmuch tag "
\r
90 - ;; Perform some validation
\r
91 - (when (null actions) (error "No operations given"))
\r
92 - (mapc (lambda (action)
\r
93 - (unless (string-match-p "^[-+][-+_.[:word:]]+$" action)
\r
94 - (error "Action must be of the form `+this_tag' or `-that_tag'")))
\r
96 (apply 'notmuch-tag notmuch-search-query-string actions))
\r
98 (defun notmuch-search-buffer-title (query)
\r