From: Dmitry Kurochkin Date: Mon, 30 Jan 2012 05:34:01 +0000 (+0400) Subject: [PATCH v3 09/12] emacs: relax tag syntax check in `notmuch-tag' function X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=987766143d7aebe65bd77f133fe561e4951e4890;p=notmuch-archives.git [PATCH v3 09/12] emacs: relax tag syntax check in `notmuch-tag' function --- diff --git a/b7/65b41c4ef39d4263d561393ade85694d21caca b/b7/65b41c4ef39d4263d561393ade85694d21caca new file mode 100644 index 000000000..35f21b45a --- /dev/null +++ b/b7/65b41c4ef39d4263d561393ade85694d21caca @@ -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 5BAEE421192 + for ; Sun, 29 Jan 2012 21:36:08 -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 QONtkJAJeDxN for ; + Sun, 29 Jan 2012 21:36:07 -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 8E2E8421166 + for ; Sun, 29 Jan 2012 21:35:33 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so1052482bke.26 + for ; Sun, 29 Jan 2012 21:35:33 -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=887hgYz7Xoetg5VdjB26vqceBsGKNEgogb8wZrkNq1I=; + b=s2Fs+V/RBD55mXgNq0XS5C2Ok33kStEGk7umCA5uOTOZ96ZduaglFRbj1ryxN+LsuI + rkGFPsE6pBSx4iWIEy8dszUYcOfceWLvtBLbJs95Fdql7PoS/7MJhkppl3TMDDYBWza3 + UPY/fa0r7CDBQ7imFTak7tBzmPVoWBFRJdPg4= +Received: by 10.204.152.88 with SMTP id f24mr7541814bkw.31.1327901733318; + Sun, 29 Jan 2012 21:35:33 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id x20sm19930970bka.9.2012.01.29.21.35.32 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Jan 2012 21:35:32 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v3 09/12] emacs: relax tag syntax check in `notmuch-tag' + function +Date: Mon, 30 Jan 2012 09:34:01 +0400 +Message-Id: <1327901644-15799-10-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1327901644-15799-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327901644-15799-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 05:36:09 -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 0a3bd17..2332c42 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -556,7 +556,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 +