From: Dmitry Kurochkin Date: Tue, 31 Jan 2012 04:54:15 +0000 (+0400) Subject: [PATCH v4 01/12] emacs: move tag format validation to `notmuch-tag' function X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3976cf07af846ffdac1d7acd72b3d3d8d9c0f4c9;p=notmuch-archives.git [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 index 000000000..7d73241ed --- /dev/null +++ b/cb/f6fcb9c46f827c88afb83f2f6a9287417ebc6a @@ -0,0 +1,101 @@ +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 C1B2E421192 + for ; Mon, 30 Jan 2012 20:55:47 -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 6Q6QgVW4N34d for ; + Mon, 30 Jan 2012 20:55: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 12C5B431FBC + for ; Mon, 30 Jan 2012 20:55:46 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so2152468bke.26 + for ; Mon, 30 Jan 2012 20:55:46 -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=8vCRF4eaWE31HhzbTFH5/b5zIqqo1QAuNM7SxxsSe6k=; + b=j8gUdwmUgAKLMMj5b9QiqYNKgwn6tbiEpHeMkjVHmDBSpjc2fTGjqt2quACNLbif2H + gIYHiKty8bpg7VRHtkMhGDzpveFlA9AMXXa9PAqRHsmhCNiLYGbpY2bw+iZv73uuHs6D + vuipIdAR0eJ4aY+N8x/ec86djAUP97iPTtk0k= +Received: by 10.204.153.206 with SMTP id l14mr10138391bkw.3.1327985746734; + Mon, 30 Jan 2012 20:55:46 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id ga13sm42513337bkc.5.2012.01.30.20.55.45 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 30 Jan 2012 20:55:45 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v4 01/12] emacs: move tag format validation to `notmuch-tag' + function +Date: Tue, 31 Jan 2012 08:54:15 +0400 +Message-Id: <1327985666-29191-2-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.9 +In-Reply-To: <1327985666-29191-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327901644-15799-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327985666-29191-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: Tue, 31 Jan 2012 04:55:48 -0000 + +Before the change, tag format validation was done in +`notmuch-search-operate-all' function only. The patch moves it down +to `notmuch-tag', so that all users of that function get input +validation. +--- + emacs/notmuch.el | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 72f78ed..84d7d0a 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -522,6 +522,12 @@ Note: Other code should always use this function alter tags of + 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 "^[-+][-+_.[:word:]]+$" 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))) +@@ -890,12 +896,6 @@ characters as well as `_.+-'. + (interactive (notmuch-select-tags-with-completion + "Operations (+add -drop): notmuch tag " + '("+" "-"))) +- ;; Perform some validation +- (when (null actions) (error "No operations given")) +- (mapc (lambda (action) +- (unless (string-match-p "^[-+][-+_.[:word:]]+$" action) +- (error "Action must be of the form `+this_tag' or `-that_tag'"))) +- actions) + (apply 'notmuch-tag notmuch-search-query-string actions)) + + (defun notmuch-search-buffer-title (query) +-- +1.7.9 +