--- /dev/null
+Return-Path: <ingmar@exherbo.org>\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 13AF8431FBC\r
+ for <notmuch@notmuchmail.org>; Tue, 17 Nov 2009 15:23:54 -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 Ob2qfkmzy1uM for <notmuch@notmuchmail.org>;\r
+ Tue, 17 Nov 2009 15:23:52 -0800 (PST)\r
+Received: from mout.perfora.net (mout.perfora.net [74.208.4.195])\r
+ by olra.theworths.org (Postfix) with ESMTP id 364C9431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 17 Nov 2009 15:23:52 -0800 (PST)\r
+Received: from bach.exherbo.org (bach.exherbo.org [78.47.197.147])\r
+ by mx.perfora.net (node=mxus2) with ESMTP (Nemesis)\r
+ id 0MKobQ-1NAXOo3mDo-000PV3 for notmuch@notmuchmail.org;\r
+ Tue, 17 Nov 2009 18:23:51 -0500\r
+Received: from [83.101.72.69] (helo=localhost)\r
+ by bach.exherbo.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69)\r
+ (envelope-from <ingmar@exherbo.org>)\r
+ id 1NAXOm-0001SR-MD; Tue, 17 Nov 2009 23:23:49 +0000\r
+From: Ingmar Vanhassel <ingmar@exherbo.org>\r
+To: <notmuch@notmuchmail.org>\r
+Date: Wed, 18 Nov 2009 00:23:42 +0100\r
+Message-Id: <1258500222-32066-1-git-send-email-ingmar@exherbo.org>\r
+X-Mailer: git-send-email 1.6.5.2.433.g23cdb\r
+Subject: [notmuch] [PATCH] Typsos\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: Tue, 17 Nov 2009 23:23:54 -0000\r
+\r
+---\r
+ Makefile | 4 ++--\r
+ README | 6 +++---\r
+ gmime-filter-reply.h | 2 +-\r
+ lib/database.cc | 2 +-\r
+ lib/index.cc | 2 +-\r
+ lib/message.cc | 2 +-\r
+ lib/messages.c | 2 +-\r
+ lib/notmuch-private.h | 2 +-\r
+ lib/notmuch.h | 10 +++++-----\r
+ lib/sha1.c | 2 +-\r
+ lib/thread.cc | 2 +-\r
+ notmuch-completion.bash | 2 +-\r
+ notmuch-new.c | 4 ++--\r
+ notmuch-search.c | 2 +-\r
+ notmuch.1 | 4 ++--\r
+ notmuch.el | 10 +++++-----\r
+ show-message.c | 2 +-\r
+ 17 files changed, 30 insertions(+), 30 deletions(-)\r
+\r
+diff --git a/Makefile b/Makefile\r
+index 436dacf..96aaa73 100644\r
+--- a/Makefile\r
++++ b/Makefile\r
+@@ -1,4 +1,4 @@\r
+-# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")\r
++# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")\r
+ WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum\r
+ CFLAGS=-O2\r
+ \r
+@@ -14,7 +14,7 @@ override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)\r
+ override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \\r
+ `xapian-config --libs`\r
+ \r
+-# Include our local Makfile.local first so that its first target is default\r
++# Include our local Makefile.local first so that its first target is default\r
+ include Makefile.local\r
+ include lib/Makefile.local\r
+ \r
+diff --git a/README b/README\r
+index 40f05ab..27af77f 100644\r
+--- a/README\r
++++ b/README\r
+@@ -3,7 +3,7 @@ Notmuch - thread-based email index, search and tagging.\r
+ Notmuch is a system for indexing, searching, reading, and tagging\r
+ large collections of email messages. It uses the Xapian library to\r
+ provide fast, full-text search of very large collection of email with\r
+-a very convenient search syntas.\r
++a very convenient search syntax.\r
+ \r
+ Notmuch is free software, released under the GNU General Public\r
+ License version 3 (or later).\r
+@@ -45,7 +45,7 @@ obtaining a more sophisticated interface:\r
+ notmuch.el file in this distribution.\r
+ \r
+ If someone were to write a curses-based interface, or similar,\r
+- it might also be reasonable to buil on the "notmuch"\r
++ it might also be reasonable to build on the "notmuch"\r
+ command-line interface.\r
+ \r
+ 2. Build on top of the notmuch library interface.\r
+@@ -67,4 +67,4 @@ still in development. We would appreciate any contributions to these\r
+ efforts.\r
+ \r
+ \r
+- \r
+\ No newline at end of file\r
++ \r
+diff --git a/gmime-filter-reply.h b/gmime-filter-reply.h\r
+index 41cbc13..b7cbc6b 100644\r
+--- a/gmime-filter-reply.h\r
++++ b/gmime-filter-reply.h\r
+@@ -40,7 +40,7 @@ typedef struct _GMimeFilterReplyClass GMimeFilterReplyClass;\r
+ * @saw_nl: previous char was a \n\r
+ * @saw_angle: previous char was a >\r
+ *\r
+- * A filter to insert/remove reply markers (lines begining with >)\r
++ * A filter to insert/remove reply markers (lines beginning with >)\r
+ **/\r
+ struct _GMimeFilterReply {\r
+ GMimeFilter parent_object;\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 3c8d626..27597cf 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -180,7 +180,7 @@ notmuch_status_to_string (notmuch_status_t status)\r
+ case NOTMUCH_STATUS_TAG_TOO_LONG:\r
+ return "Tag value is too long (exceeds NOTMUCH_TAG_MAX)";\r
+ case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:\r
+- return "Unblanced number of calls to notmuch_message_freeze/thaw";\r
++ return "Unbalanced number of calls to notmuch_message_freeze/thaw";\r
+ default:\r
+ case NOTMUCH_STATUS_LAST_STATUS:\r
+ return "Unknown error status value";\r
+diff --git a/lib/index.cc b/lib/index.cc\r
+index 65b83b3..80df64b 100644\r
+--- a/lib/index.cc\r
++++ b/lib/index.cc\r
+@@ -198,7 +198,7 @@ _index_mime_part (notmuch_message_t *message,\r
+ if (i == 1)\r
+ continue;\r
+ if (i > 1)\r
+- fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Indexing anyway.\n");\r
++ fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n");\r
+ }\r
+ _index_mime_part (message,\r
+ g_mime_multipart_get_part (multipart, i));\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index a4b090b..1d6623f 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -144,7 +144,7 @@ _notmuch_message_create (const void *talloc_owner,\r
+ }\r
+ \r
+ /* Create a new notmuch_message_t object for a specific message ID,\r
+- * (which may or may not already exist in the databas).\r
++ * (which may or may not already exist in the database).\r
+ *\r
+ * Here, 'talloc owner' is an optional talloc context to which the new\r
+ * message will belong. This allows for the caller to not bother\r
+diff --git a/lib/messages.c b/lib/messages.c\r
+index a588f8f..2f7c283 100644\r
+--- a/lib/messages.c\r
++++ b/lib/messages.c\r
+@@ -47,7 +47,7 @@ _notmuch_message_list_create (const void *ctx)\r
+ return list;\r
+ }\r
+ \r
+-/* Append 'node' (which can of course point to an aribtrarily long\r
++/* Append 'node' (which can of course point to an arbitrarily long\r
+ * list of nodes) to the end of 'list'.\r
+ */\r
+ void\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 6036ce4..af82e58 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -235,7 +235,7 @@ notmuch_message_file_open (const char *filename);\r
+ notmuch_message_file_t *\r
+ _notmuch_message_file_open_ctx (void *ctx, const char *filename);\r
+ \r
+-/* Close a notmuch message preivously opened with notmuch_message_open. */\r
++/* Close a notmuch message previously opened with notmuch_message_open. */\r
+ void\r
+ notmuch_message_file_close (notmuch_message_file_t *message);\r
+ \r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index 32b5332..384c177 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -222,7 +222,7 @@ notmuch_database_get_timestamp (notmuch_database_t *database,\r
+ \r
+ /* Add a new message to the given notmuch database.\r
+ *\r
+- * Here,'filename' should be a path relative to the the path of\r
++ * Here,'filename' should be a path relative to the path of\r
+ * 'database' (see notmuch_database_get_path), or else should be an\r
+ * absolute filename with initial components that match the path of\r
+ * 'database'.\r
+@@ -258,7 +258,7 @@ notmuch_database_add_message (notmuch_database_t *database,\r
+ const char *filename,\r
+ notmuch_message_t **message);\r
+ \r
+-/* Find a message with the given messsage_id.\r
++/* Find a message with the given message_id.\r
+ *\r
+ * If the database contains a message with the given message_id, then\r
+ * a new notmuch_message_t object is returned. The caller should call\r
+@@ -620,7 +620,7 @@ notmuch_messages_advance (notmuch_messages_t *messages);\r
+ /* Destroy a notmuch_messages_t object.\r
+ *\r
+ * It's not strictly necessary to call this function. All memory from\r
+- * the notmuch_messages_t object will be reclaimed when the containg\r
++ * the notmuch_messages_t object will be reclaimed when the containing\r
+ * query object is destroyed.\r
+ */\r
+ void\r
+@@ -865,7 +865,7 @@ notmuch_tags_has_more (notmuch_tags_t *tags);\r
+ /* Get the current tag from 'tags' as a string.\r
+ *\r
+ * Note: The returned string belongs to 'tags' and has a lifetime\r
+- * identical to it (and the query to which it utlimately belongs).\r
++ * identical to it (and the query to which it ultimately belongs).\r
+ *\r
+ * See the documentation of notmuch_message_get_tags for example code\r
+ * showing how to iterate over a notmuch_tags_t object.\r
+@@ -884,7 +884,7 @@ notmuch_tags_advance (notmuch_tags_t *tags);\r
+ /* Destroy a notmuch_tags_t object.\r
+ *\r
+ * It's not strictly necessary to call this function. All memory from\r
+- * the notmuch_tags_t object will be reclaimed when the containg\r
++ * the notmuch_tags_t object will be reclaimed when the containing\r
+ * message or query objects are destroyed.\r
+ */\r
+ void\r
+diff --git a/lib/sha1.c b/lib/sha1.c\r
+index ff4dd16..cc48108 100644\r
+--- a/lib/sha1.c\r
++++ b/lib/sha1.c\r
+@@ -43,7 +43,7 @@ _hex_of_sha1_digest (const unsigned char digest[SHA1_DIGEST_SIZE])\r
+ return result;\r
+ }\r
+ \r
+-/* Create a hexadcimal string version of the SHA-1 digest of 'str'\r
++/* Create a hexadecimal string version of the SHA-1 digest of 'str'\r
+ * (including its null terminating character).\r
+ *\r
+ * This function returns a newly allocated string which the caller\r
+diff --git a/lib/thread.cc b/lib/thread.cc\r
+index 4411d64..da58edc 100644\r
+--- a/lib/thread.cc\r
++++ b/lib/thread.cc\r
+@@ -190,7 +190,7 @@ _resolve_thread_relationships (unused (notmuch_thread_t *thread))\r
+ * subject line, the total count of messages, and all authors). The\r
+ * second search is for all messages that are in the thread and that\r
+ * also match the given query_string. This is to allow for a separate\r
+- * count of matched messages, and to allow a viewer to diplay these\r
++ * count of matched messages, and to allow a viewer to display these\r
+ * messages differently.\r
+ *\r
+ * Here, 'ctx' is talloc context for the resulting thread object.\r
+diff --git a/notmuch-completion.bash b/notmuch-completion.bash\r
+index ad55f6d..cdad05d 100644\r
+--- a/notmuch-completion.bash\r
++++ b/notmuch-completion.bash\r
+@@ -1,4 +1,4 @@\r
+-# Bash completion for notmutch\r
++# Bash completion for notmuch\r
+ #\r
+ # Copyright © 2009 Carl Worth\r
+ #\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index 83a05ba..5405a9f 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -303,7 +303,7 @@ add_files (notmuch_database_t *notmuch,\r
+ \r
+ /* XXX: This should be merged with the add_files function since it\r
+ * shares a lot of logic with it. */\r
+-/* Recursively count all regular files in path and all sub-direcotries\r
++/* Recursively count all regular files in path and all sub-directories\r
+ * of path. The result is added to *count (which should be\r
+ * initialized to zero by the top-level caller before calling\r
+ * count_files). */\r
+@@ -469,7 +469,7 @@ notmuch_new_command (void *ctx,\r
+ \r
+ if (elapsed > 1 && ! add_files_state.saw_read_only_directory) {\r
+ printf ("\nTip: If you have any sub-directories that are archives (that is,\n"\r
+- "they will never receive new mail), marking these directores as\n"\r
++ "they will never receive new mail), marking these directories as\n"\r
+ "read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n"\r
+ "much more efficient (it won't even look in those directories).\n");\r
+ }\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 8db09c7..ac81372 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -76,7 +76,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ \r
+ query_str = query_string_from_args (ctx, argc, argv);\r
+ if (query_str == NULL) {\r
+- fprintf (stderr, "Out of moemory.\n");\r
++ fprintf (stderr, "Out of memory.\n");\r
+ return 1;\r
+ }\r
+ \r
+diff --git a/notmuch.1 b/notmuch.1\r
+index 6c3d10f..86d5f59 100644\r
+--- a/notmuch.1\r
++++ b/notmuch.1\r
+@@ -60,7 +60,7 @@ archives, and will then proceed to build a database that indexes the\r
+ mail to allow for fast search of the archive.\r
+ \r
+ This directory can contain any number of sub-directories and should\r
+-primarily contain only files with indvidual email messages\r
++primarily contain only files with individual email messages\r
+ (eg. maildir or mh archives are perfect). If there are other,\r
+ non-email files (such as indexes maintained by other email programs)\r
+ then notmuch will do its best to detect those and ignore them.\r
+@@ -173,7 +173,7 @@ Constructs a reply template for a set of messages.\r
+ \r
+ See the documentation of\r
+ .B search\r
+-for deatils of the supported syntax of search terms.\r
++for details of the supported syntax of search terms.\r
+ \r
+ To make replying to email easier,\r
+ .B notmuch reply\r
+diff --git a/notmuch.el b/notmuch.el\r
+index 8894a8e..7e01ed6 100644\r
+--- a/notmuch.el\r
++++ b/notmuch.el\r
+@@ -205,7 +205,7 @@ Unlike builtin `next-line' this version accepts no arguments."\r
+ (defun notmuch-show-mark-read-then-archive-thread ()\r
+ "Remove \"unread\" tag from each message, then archive and show next thread.\r
+ \r
+-Archive each message currrently shown by removing the \"unread\"\r
++Archive each message currently shown by removing the \"unread\"\r
+ and \"inbox\" tag from each. Then kill this buffer and show the\r
+ next thread from the search from which this thread was originally\r
+ shown.\r
+@@ -220,7 +220,7 @@ buffer."\r
+ (defun notmuch-show-archive-thread ()\r
+ "Archive each message in thread, and show next thread from search.\r
+ \r
+-Archive each message currrently shown by removing the \"inbox\"\r
++Archive each message currently shown by removing the \"inbox\"\r
+ tag from each. Then kill this buffer and show the next thread\r
+ from the search from which this thread was originally shown.\r
+ \r
+@@ -340,7 +340,7 @@ there are no more unread messages past the current point."\r
+ (notmuch-show-next-message)))\r
+ \r
+ (defun notmuch-show-next-open-message ()\r
+- "Advance to the the next message which is not hidden.\r
++ "Advance to the next message which is not hidden.\r
+ \r
+ If read messages are currently hidden, advance to the next unread\r
+ message. Otherwise, advance to the next message."\r
+@@ -674,7 +674,7 @@ thread from that buffer can be show when done with this one)."\r
+ )))\r
+ \r
+ (defvar notmuch-search-authors-width 40\r
+- "Number of columns to use to diplay authors in a notmuch-search buffer.")\r
++ "Number of columns to use to display authors in a notmuch-search buffer.")\r
+ \r
+ (defvar notmuch-search-mode-map\r
+ (let ((map (make-sparse-keymap)))\r
+@@ -910,7 +910,7 @@ the beginning of the buffer).\r
+ \r
+ This command toggles the sort order for the current search.\r
+ \r
+-Note that any fitlered searches created by\r
++Note that any filtered searches created by\r
+ `notmuch-search-filter' retain the search order of the parent\r
+ search."\r
+ (interactive)\r
+diff --git a/show-message.c b/show-message.c\r
+index 79b02e2..38f5897 100644\r
+--- a/show-message.c\r
++++ b/show-message.c\r
+@@ -38,7 +38,7 @@ show_message_part (GMimeObject *part, int *part_count,\r
+ if (i == 1)\r
+ continue;\r
+ if (i > 1)\r
+- fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n");\r
++ fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Continuing.\n");\r
+ }\r
+ show_message_part (g_mime_multipart_get_part (multipart, i),\r
+ part_count, show_part);\r
+-- \r
+1.6.5.2.433.g23cdb\r
+\r
projects / notmuch-archives.git / commitdiff