X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=ce9a86bfddb8b525a19ecefe27d443bb803a8d01;hp=eaf526677f789a6939ae86adc3b530327289dcf0;hb=fc3a3be33716675a4169ab4265a28250764b283d;hpb=6e9fdf0abf050647da53349943a12f53af692e99

diff --git a/lib/database.cc b/lib/database.cc
index eaf52667..ce9a86bf 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -42,7 +42,8 @@ typedef struct {
  * Mail document
  * -------------
  * A mail document is associated with a particular email message file
- * on disk. It is indexed with the following prefixed terms:
+ * on disk. It is indexed with the following prefixed terms which the
+ * database uses to construct threads, etc.:
  *
  *    Single terms of given prefix:
  *
@@ -53,6 +54,8 @@ typedef struct {
  *
  *	thread:	The ID of the thread to which the mail belongs
  *
+ *	replyto: The ID from the In-Reply-To header of the mail (if any).
+ *
  *    Multiple terms of given prefix:
  *
  *	reference: All message IDs from In-Reply-To and Re ferences
@@ -67,6 +70,11 @@ typedef struct {
  *
  *	MESSAGE_ID:	The unique ID of the mail mess (see "id" above)
  *
+ * In addition, terms from the content of the message are added with
+ * "from", "to", "attachment", and "subject" prefixes for use by the
+ * user in searching. But the database doesn't really care itself
+ * about any of these.
+ *
  * Timestamp document
  * ------------------
  * A timestamp document is used by a client of the notmuch library to
@@ -309,7 +317,7 @@ skip_space_and_comments (const char **str)
  * Returns a newly talloc'ed string belonging to 'ctx'.
  *
  * Returns NULL if there is any error parsing the message-id. */
-char *
+static char *
 _parse_message_id (void *ctx, const char *message_id, const char **next)
 {
     const char *s, *end;
@@ -718,7 +726,8 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
 
     /* Carefully avoid adding any self-referential in-reply-to term. */
     in_reply_to_message_id = _parse_message_id (message, in_reply_to, NULL);
-    if (strcmp (in_reply_to_message_id,
+    if (in_reply_to_message_id &&
+	strcmp (in_reply_to_message_id,
 		notmuch_message_get_message_id (message)))
     {
 	_notmuch_message_add_term (message, "replyto",