[notmuch] [PATCH] correct message flag enum value so that it matches the type

diff --git a/2e/e0034f71dabbf47d85b63bca7db01ca5aef3d4 b/2e/e0034f71dabbf47d85b63bca7db01ca5aef3d4
new file mode 100644 (file)
index 0000000..ff8d741
--- /dev/null
+++ b/2e/e0034f71dabbf47d85b63bca7db01ca5aef3d4
@@ -0,0 +1,93 @@
+Return-Path: <bart@jukie.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id BD4EC431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Nov 2009 18:22:03 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id YlQuSbV1ya5t for <notmuch@notmuchmail.org>;\r
+       Fri, 27 Nov 2009 18:22:01 -0800 (PST)\r
+Received: from tau.jukie.net (tau.jukie.net [216.239.93.128])\r
+       by olra.theworths.org (Postfix) with ESMTP id 50728431FC3\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Nov 2009 18:22:01 -0800 (PST)\r
+Received: from localhost.localdomain (oxygen.jukie.net [10.10.10.8])\r
+       by tau.jukie.net (Postfix) with ESMTP id D42FBC0090C;\r
+       Fri, 27 Nov 2009 21:22:00 -0500 (EST)\r
+From: Bart Trojanowski <bart@jukie.net>\r
+To: notmuch@notmuchmail.org\r
+Date: Fri, 27 Nov 2009 21:20:09 -0500\r
+Message-Id: <1259374809-28752-1-git-send-email-bart@jukie.net>\r
+X-Mailer: git-send-email 1.6.4.4.2.gc2f148\r
+In-Reply-To: <87iqcvbgaw.fsf@yoom.home.cworth.org>\r
+References: <87iqcvbgaw.fsf@yoom.home.cworth.org>\r
+Cc: Bart Trojanowski <bart@jukie.net>\r
+Subject: [notmuch] [PATCH] correct message flag enum value so that it\r
+       matches the type\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.12\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 Nov 2009 02:22:03 -0000\r
+\r
+As per Carl's request, this patch corrects the only value defined under\r
+the notmuch_message_flag_t enum typedef to match the name of the type.\r
+\r
+Signed-off-by: Bart Trojanowski <bart@jukie.net>\r
+---\r
+ lib/notmuch.h  |    2 +-\r
+ lib/thread.cc  |    2 +-\r
+ notmuch-show.c |    2 +-\r
+ 3 files changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index e4f3992..60834fb 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -711,7 +711,7 @@ notmuch_message_get_filename (notmuch_message_t *message);\r
+ \r
+ /* Message flags */\r
+ typedef enum _notmuch_message_flag {\r
+-    NOTMUCH_MSG_FLAG_MATCHING_SEARCH,\r
++    NOTMUCH_MESSAGE_FLAG_MATCH,\r
+ } notmuch_message_flag_t;\r
+ \r
+ /* Get a value of a flag for the email corresponding to 'message'. */\r
+diff --git a/lib/thread.cc b/lib/thread.cc\r
+index 9e4cb5c..321937b 100644\r
+--- a/lib/thread.cc\r
++++ b/lib/thread.cc\r
+@@ -148,7 +148,7 @@ _thread_add_matched_message (notmuch_thread_t *thread,\r
+                           notmuch_message_get_message_id (message), NULL,\r
+                           (void **) &hashed_message)) {\r
+       notmuch_message_set_flag (hashed_message,\r
+-                      NOTMUCH_MSG_FLAG_MATCHING_SEARCH, 1);\r
++                                NOTMUCH_MESSAGE_FLAG_MATCH, 1);\r
+     }\r
+ }\r
+ \r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index f189e94..13c91e4 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -158,7 +158,7 @@ show_message (void *ctx, notmuch_message_t *message, int indent)\r
+     printf ("\fmessage{ id:%s depth:%d match:%d filename:%s\n",\r
+           notmuch_message_get_message_id (message),\r
+           indent,\r
+-          notmuch_message_get_flag (message, NOTMUCH_MSG_FLAG_MATCHING_SEARCH),\r
++          notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH),\r
+           notmuch_message_get_filename (message));\r
+ \r
+     printf ("\fheader{\n");\r
+-- \r
+1.6.4.4.2.gc2f148\r
+\r