From: Dmitry Kurochkin Date: Tue, 31 Jan 2012 04:54:25 +0000 (+0400) Subject: [PATCH v4 11/12] emacs: s/tags/tag-changes/ for arguments of tagging functions X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9367a4685dc372ecea00a7ff3d34f402987d914c;p=notmuch-archives.git [PATCH v4 11/12] emacs: s/tags/tag-changes/ for arguments of tagging functions --- diff --git a/a3/00f400a2c25ef61c4c439844b984abb9fffc6d b/a3/00f400a2c25ef61c4c439844b984abb9fffc6d new file mode 100644 index 000000000..3c40e72a4 --- /dev/null +++ b/a3/00f400a2c25ef61c4c439844b984abb9fffc6d @@ -0,0 +1,161 @@ +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 D62DA41ED96 + for ; Mon, 30 Jan 2012 20:56:46 -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 BYvojLrcVwUG for ; + Mon, 30 Jan 2012 20:56:44 -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 A2FAF414B91 + for ; Mon, 30 Jan 2012 20:56:06 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so2152468bke.26 + for ; Mon, 30 Jan 2012 20:56:06 -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=VApMV7kzz+Ak6NA+mwWA7ZOcN9TXp+t5i2+AAhoGtVg=; + b=gJVnJiAvhNhkSTVWtqLZVo3lUZfPOD7Fum5QS0h6BWbAaGvN49bWDb/+ESlJy+Xnn1 + NTOKC+e9lCICVMUvWLtxFAvsV7DQoip+eLluYOCa6Jn7QrRSOzRZ8ZligtRTfU/4lyX1 + YJNy+iTNudKfbAhMEnGN04Rp+BhuTyrEd0jR4= +Received: by 10.205.120.132 with SMTP id fy4mr10091368bkc.23.1327985766306; + Mon, 30 Jan 2012 20:56:06 -0800 (PST) +Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id + fg16sm42427534bkb.16.2012.01.30.20.56.05 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 30 Jan 2012 20:56:05 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v4 11/12] emacs: s/tags/tag-changes/ for arguments of tagging + functions +Date: Tue, 31 Jan 2012 08:54:25 +0400 +Message-Id: <1327985666-29191-12-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:56:47 -0000 + +This makes the argument names more consistent and clear. The +following functions changed: `notmuch-tag', +`notmuch-search-tag-thread', `notmuch-search-tag-region' and +`notmuch-search-tag-all'. +--- + emacs/notmuch.el | 33 +++++++++++++++++---------------- + 1 files changed, 17 insertions(+), 16 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index c464c3c..fa62019 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -543,25 +543,26 @@ and will also appear in a buffer named \"*Notmuch errors*\"." + (error (buffer-substring beg end)) + )))))) + +-(defun notmuch-tag (query &rest tags) +- "Add/remove tags in TAGS to messages matching QUERY. ++(defun notmuch-tag (query &rest tag-changes) ++ "Add/remove tags in TAG-CHANGES to messages matching QUERY. + +-TAGS should be a list of strings of the form \"+TAG\" or \"-TAG\" and +-QUERY should be a string containing the search-query. ++TAG-CHANGES should be a list of strings of the form \"+tag\" or ++\"-tag\" and QUERY should be a string containing the ++search-query. + + 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 +- (mapc (lambda (tag) +- (unless (string-match-p "^[-+]\\S-+$" tag) ++ (mapc (lambda (tag-change) ++ (unless (string-match-p "^[-+]\\S-+$" tag-change) + (error "Tag must be of the form `+this_tag' or `-that_tag'"))) +- tags) +- (unless (null tags) ++ tag-changes) ++ (unless (null tag-changes) + (run-hooks 'notmuch-before-tag-hook) + (apply 'notmuch-call-notmuch-process "tag" +- (append tags (list "--" query))) ++ (append tag-changes (list "--" query))) + (run-hooks 'notmuch-after-tag-hook))) + + (defcustom notmuch-before-tag-hook nil +@@ -621,26 +622,26 @@ the messages that were tagged" + (forward-line 1)) + output))) + +-(defun notmuch-search-tag-thread (&rest tags) ++(defun notmuch-search-tag-thread (&rest tag-changes) + "Change tags for the currently selected thread. + + See `notmuch-search-tag-region' for details." +- (apply 'notmuch-search-tag-region (point) (point) tags)) ++ (apply 'notmuch-search-tag-region (point) (point) tag-changes)) + +-(defun notmuch-search-tag-region (beg end &rest tags) ++(defun notmuch-search-tag-region (beg end &rest tag-changes) + "Change tags for threads in the given region. + + TAGS is a list of tag operations for `notmuch-tag'. The tags are + added or removed for all threads in the region from BEG to END." + (let ((search-string (notmuch-search-find-thread-id-region-search beg end))) +- (apply 'notmuch-tag search-string tags) ++ (apply 'notmuch-tag search-string tag-changes) + (save-excursion + (let ((last-line (line-number-at-pos end)) + (max-line (- (line-number-at-pos (point-max)) 2))) + (goto-char beg) + (while (<= (line-number-at-pos) (min last-line max-line)) + (notmuch-search-set-tags +- (notmuch-update-tags (notmuch-search-get-tags) tags)) ++ (notmuch-update-tags (notmuch-search-get-tags) tag-changes)) + (forward-line)))))) + + (defun notmuch-search-tag (&optional initial-input) +@@ -892,7 +893,7 @@ non-authors is found, assume that all of the authors match." + (goto-char found-target))) + (delete-process proc)))) + +-(defun notmuch-search-tag-all (&rest actions) ++(defun notmuch-search-tag-all (&rest tag-changes) + "Add/remove tags from all matching messages. + + This command adds or removes tags from all messages matching the +@@ -904,7 +905,7 @@ Each character of the tag name may consist of alphanumeric + characters as well as `_.+-'. + " + (interactive (notmuch-read-tag-changes)) +- (apply 'notmuch-tag notmuch-search-query-string actions)) ++ (apply 'notmuch-tag notmuch-search-query-string tag-changes)) + + (defun notmuch-search-buffer-title (query) + "Returns the title for a buffer with notmuch search results." +-- +1.7.9 +