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