From: Dmitry Kurochkin Date: Mon, 30 Jan 2012 02:26:18 +0000 (+0400) Subject: [PATCH v2 09/13] emacs: relax tag syntax check in `notmuch-tag' function X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fc122048030693a36b759b6c1a4149e00a8080f0;p=notmuch-archives.git [PATCH v2 09/13] emacs: relax tag syntax check in `notmuch-tag' function --- diff --git a/d2/a1581c7f6692adddc09e629f44a691435c0c08 b/d2/a1581c7f6692adddc09e629f44a691435c0c08 new file mode 100644 index 000000000..63ba46940 --- /dev/null +++ b/d2/a1581c7f6692adddc09e629f44a691435c0c08 @@ -0,0 +1,85 @@ +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 02E0A421166 + for ; Sun, 29 Jan 2012 18:28:23 -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 If4QzNJdoS19 for ; + Sun, 29 Jan 2012 18:28:21 -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 41798421179 + for ; Sun, 29 Jan 2012 18:27:53 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so960274bke.26 + for ; Sun, 29 Jan 2012 18:27:53 -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=8Re8M7Y4zrWBkYZMjKLxJme9iU+a1cSqnzzHjlKYQEo=; + b=YPPsy/lCRN1ivEdEj3PZ2BxyRDAJb/+bG7gYe7ES4buf1j8l3err7VQ25xrhMs0kVq + p3F0DQ2HMac7YU3JT8a+itFVwXeZl/eDWJGPg1DMrEfQhzTb+TXjF3pmqo0WpFEREQ9Y + JLPQnr31Sg8WzWLX25HtnGZzkBVRz29Mu9Ch0= +Received: by 10.204.152.201 with SMTP id h9mr7690018bkw.105.1327890473017; + Sun, 29 Jan 2012 18:27:53 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id bw9sm34261758bkb.8.2012.01.29.18.27.51 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Jan 2012 18:27:52 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v2 09/13] emacs: relax tag syntax check in `notmuch-tag' + function +Date: Mon, 30 Jan 2012 06:26:18 +0400 +Message-Id: <1327890382-548-10-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327890382-548-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: Mon, 30 Jan 2012 02:28:23 -0000 + +The tag syntax check in `notmuch-tag' function was too strict and did +not allow nmbug tags with "::". Since the check is done for all +tagging operations in Emacs UI, this basically means that no nmbug +tags can be changed. The patch relaxes the tag syntax check to allow +any tag names that do not include whitespace characters. +--- + emacs/notmuch.el | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 5adcac5..7e8f185 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -557,7 +557,7 @@ 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) ++ (unless (string-match-p "^[-+]\\S-+$" tag) + (error "Tag must be of the form `+this_tag' or `-that_tag'"))) + tags) + (run-hooks 'notmuch-before-tag-hook) +-- +1.7.8.3 +