--- /dev/null
+Return-Path: <pieter@praet.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 092DB431FD0\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Jun 2011 13:14:36 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 xob5mgnX--Z4 for <notmuch@notmuchmail.org>;\r
+ Mon, 20 Jun 2011 13:14:33 -0700 (PDT)\r
+Received: from mail-wy0-f181.google.com (mail-wy0-f181.google.com\r
+ [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 7163D431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Jun 2011 13:14:33 -0700 (PDT)\r
+Received: by wyb28 with SMTP id 28so2744025wyb.26\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Jun 2011 13:14:32 -0700 (PDT)\r
+Received: by 10.227.24.8 with SMTP id t8mr5490699wbb.0.1308600872001;\r
+ Mon, 20 Jun 2011 13:14:32 -0700 (PDT)\r
+Received: from localhost ([109.131.43.100])\r
+ by mx.google.com with ESMTPS id en1sm3455196wbb.35.2011.06.20.13.14.28\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 20 Jun 2011 13:14:29 -0700 (PDT)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] fix sum moar typos\r
+Date: Mon, 20 Jun 2011 22:14:21 +0200\r
+Message-Id: <1308600861-22684-1-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.4.1\r
+In-Reply-To: <1307202852-4398-1-git-send-email-pieter@praet.org>\r
+References: <1307202852-4398-1-git-send-email-pieter@praet.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Mon, 20 Jun 2011 20:14:36 -0000\r
+\r
+Various typo fixes in docs, docstrings, comments, etc...\r
+\r
+Signed-off-by: Pieter Praet <pieter@praet.org>\r
+---\r
+Rebased to current master (12d6f90e)\r
+\r
+ NEWS | 10 +++++-----\r
+ TODO | 4 ++--\r
+ compat/README | 2 +-\r
+ completion/Makefile | 2 +-\r
+ configure | 4 ++--\r
+ emacs/Makefile | 2 +-\r
+ emacs/notmuch-hello.el | 2 +-\r
+ emacs/notmuch-lib.el | 2 +-\r
+ emacs/notmuch-maildir-fcc.el | 2 +-\r
+ emacs/notmuch-show.el | 6 +++---\r
+ emacs/notmuch-wash.el | 2 +-\r
+ emacs/notmuch.el | 6 +++---\r
+ gmime-filter-headers.h | 2 +-\r
+ lib/Makefile | 2 +-\r
+ lib/Makefile.local | 2 +-\r
+ lib/database.cc | 12 ++++++------\r
+ lib/libsha1.c | 2 +-\r
+ lib/libsha1.h | 2 +-\r
+ lib/message.cc | 4 ++--\r
+ lib/notmuch.h | 4 ++--\r
+ notmuch-config.c | 2 +-\r
+ notmuch-new.c | 2 +-\r
+ notmuch-reply.c | 4 ++--\r
+ notmuch.1 | 6 +++---\r
+ notmuch.c | 2 +-\r
+ packaging/debian | 4 ++--\r
+ test/Makefile | 2 +-\r
+ test/README | 6 +++---\r
+ test/crypto | 2 +-\r
+ test/maildir-sync | 2 +-\r
+ test/multipart | 2 +-\r
+ test/test-lib.sh | 2 +-\r
+ test/uuencode | 4 ++--\r
+ vim/README | 2 +-\r
+ vim/plugin/notmuch.vim | 4 ++--\r
+ 35 files changed, 60 insertions(+), 60 deletions(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index 5a1778e..dae7832 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -112,15 +112,15 @@ Allow for notmuch-fcc-dirs to have a value of nil.\r
+ string. Instead it's now a list of cons cells where the car of each\r
+ cell is a regular expression to be matched against the sender\r
+ address, and the cdr is the name of a folder to use for an FCC. So\r
+- the old fallback behavior can be achieved by including a fineal cell\r
++ the old fallback behavior can be achieved by including a final cell\r
+ of (".*" . "default-fcc-folder").\r
+ \r
+ Vim interface improvements\r
+ --------------------------\r
+ Felipe Contreras provided a number of updates for the vim interface.\r
+ \r
+- These include optimiations, support for newer versions of vim, fixed\r
+- support for sending mail on modern systmms, new commands, and\r
++ These include optimizations, support for newer versions of vim, fixed\r
++ support for sending mail on modern systems, new commands, and\r
+ various cleanups.\r
+ \r
+ New bindings\r
+@@ -606,7 +606,7 @@ Fix to compile against GMime 2.6\r
+ \r
+ Fix configure script to accept (and ignore) various standard options.\r
+ \r
+- For example, those that the gentoo build scripts expect configure to\r
++ For example, those that the Gentoo build scripts expect configure to\r
+ accept are now all accepted.\r
+ \r
+ Test suite\r
+@@ -714,7 +714,7 @@ tags by region.\r
+ Selective bulk tagging is now possible by selecting a region of\r
+ threads and then using either the '+' or '-' keybindings. Bulk\r
+ tagging is still available for all threads matching the current\r
+- search with th '*' binding.\r
++ search with the '*' binding.\r
+ \r
+ More meaningful buffer names for thread-view buffers.\r
+ \r
+diff --git a/TODO b/TODO\r
+index 260ffe1..14dfa55 100644\r
+--- a/TODO\r
++++ b/TODO\r
+@@ -29,7 +29,7 @@ Make 'notmuch-show-pipe-message have a private history.\r
+ \r
+ Add support for a delete keybinding that adds a "deleted" tag to the\r
+ current message/thread and make searches not return deleted messages\r
+-by default, (unless the user asks explicitly for deleted messags in\r
++by default, (unless the user asks explicitly for deleted messages in\r
+ the search query).\r
+ \r
+ Add keybindings for next/previous thread.\r
+@@ -119,7 +119,7 @@ Allow configuration for filename patterns that should be ignored when\r
+ indexing.\r
+ \r
+ Replace the "notmuch part --part=id" command with "notmuch show\r
+---part=id", (David Edmonson wants to rewrite some of "notmuch show" to\r
++--part=id", (David Edmondson wants to rewrite some of "notmuch show" to\r
+ provide more MIME-structure information in its output first).\r
+ \r
+ Replace the "notmuch search-tags" command with "notmuch search\r
+diff --git a/compat/README b/compat/README\r
+index cd32c56..38e2e14 100644\r
+--- a/compat/README\r
++++ b/compat/README\r
+@@ -1,4 +1,4 @@\r
+-notmuch/comapt\r
++notmuch/compat\r
+ \r
+ This directory consists of two things:\r
+ \r
+diff --git a/completion/Makefile b/completion/Makefile\r
+index b6859ea..de492a7 100644\r
+--- a/completion/Makefile\r
++++ b/completion/Makefile\r
+@@ -1,4 +1,4 @@\r
+-# See Makfefile.local for the list of files to be compiled in this\r
++# See Makefile.local for the list of files to be compiled in this\r
+ # directory.\r
+ all:\r
+ $(MAKE) -C .. all\r
+diff --git a/configure b/configure\r
+index cf525c9..3999ce8 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -22,7 +22,7 @@ if [ "$srcdir" != "." ]; then\r
+ fi\r
+ \r
+ # Set several defaults (optionally specified by the user in\r
+-# environemnt variables)\r
++# environment variables)\r
+ CC=${CC:-gcc}\r
+ CXX=${CXX:-g++}\r
+ CFLAGS=${CFLAGS:--O2}\r
+@@ -608,7 +608,7 @@ includedir = ${INCLUDEDIR:=\$(prefix)/include}\r
+ # The directory to which man pages should be installed\r
+ mandir = ${MANDIR:=\$(prefix)/share/man}\r
+ \r
+-# The directory to which read-only (configuration) filesshould be installed\r
++# The directory to which read-only (configuration) files should be installed\r
+ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}\r
+ \r
+ # The directory to which emacs lisp files should be installed\r
+diff --git a/emacs/Makefile b/emacs/Makefile\r
+index b6859ea..de492a7 100644\r
+--- a/emacs/Makefile\r
++++ b/emacs/Makefile\r
+@@ -1,4 +1,4 @@\r
+-# See Makfefile.local for the list of files to be compiled in this\r
++# See Makefile.local for the list of files to be compiled in this\r
+ # directory.\r
+ all:\r
+ $(MAKE) -C .. all\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 916cda1..65fde75 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -428,7 +428,7 @@ Complete list of currently available key bindings:\r
+ (let ((found-target-pos nil)\r
+ (final-target-pos nil))\r
+ (let* ((saved-alist\r
+- ;; Filter out empty saved seaches if required.\r
++ ;; Filter out empty saved searches if required.\r
+ (if notmuch-show-empty-saved-searches\r
+ notmuch-saved-searches\r
+ (loop for elem in notmuch-saved-searches\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index a21dc14..f93c957 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -88,7 +88,7 @@ the user hasn't set this variable with the old or new value."\r
+ (notmuch-config-get "user.primary_email"))\r
+ \r
+ (defun notmuch-user-other-email ()\r
+- "Return the user.primary_email value (as a list) from the notmuch configuration."\r
++ "Return the user.other_email value (as a list) from the notmuch configuration."\r
+ (split-string (notmuch-config-get "user.other_email") "\n"))\r
+ \r
+ (defun notmuch-kill-this-buffer ()\r
+diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el\r
+index aede753..ef5f9f5 100644\r
+--- a/emacs/notmuch-maildir-fcc.el\r
++++ b/emacs/notmuch-maildir-fcc.el\r
+@@ -163,7 +163,7 @@ will NOT be removed or replaced."\r
+ (make-directory (concat path "/new/") t)\r
+ (make-directory (concat path "/tmp/") t))\r
+ ((file-regular-p path)\r
+- (error "%s is a file. Can't creat maildir." path))\r
++ (error "%s is a file. Can't create maildir." path))\r
+ (t\r
+ (error "I don't know how to create a maildir here"))))\r
+ \r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 0d9b52a..9c63ecb 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -121,7 +121,7 @@ same as that of the previous message."\r
+ "Use external viewers to view all attachments from the current message."\r
+ (interactive)\r
+ (with-current-notmuch-show-message\r
+- ; We ovverride the mm-inline-media-tests to indicate which message\r
++ ; We override the mm-inline-media-tests to indicate which message\r
+ ; parts are already sufficiently handled by the original\r
+ ; presentation of the message in notmuch-show mode. These parts\r
+ ; will be inserted directly into the temporary buffer of\r
+@@ -803,7 +803,7 @@ The optional QUERY-CONTEXT is a notmuch search term. Only\r
+ messages from the thread matching this search term are shown if\r
+ non-nil.\r
+ \r
+-The optional BUFFER-NAME provides the neame of the buffer in\r
++The optional BUFFER-NAME provides the name of the buffer in\r
+ which the message thread is shown. If it is nil (which occurs\r
+ when the command is called interactively) the argument to the\r
+ function is used. "\r
+@@ -921,7 +921,7 @@ more selectively, (such as '\\[notmuch-show-next-message]' and '\\[notmuch-show-\r
+ without removing any tags, and '\\[notmuch-show-archive-thread]' to archive an entire thread\r
+ without scrolling through with \\[notmuch-show-advance-and-archive]).\r
+ \r
+-You can add or remove arbitary tags from the current message with\r
++You can add or remove arbitrary tags from the current message with\r
+ '\\[notmuch-show-add-tag]' or '\\[notmuch-show-remove-tag]'.\r
+ \r
+ All currently available key bindings:\r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index 92f07c5..1f420b2 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -137,7 +137,7 @@ collapse the remaining lines into a button.")\r
+ (format label-format lines-count)))\r
+ \r
+ (defun notmuch-wash-region-to-button (msg beg end type prefix)\r
+- "Auxilary function to do the actual making of overlays and buttons\r
++ "Auxiliary function to do the actual making of overlays and buttons\r
+ \r
+ BEG and END are buffer locations. TYPE should a string, either\r
+ \"citation\" or \"signature\". PREFIX is some arbitrary text to\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 3311fe8..f11ec24 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -64,7 +64,7 @@\r
+ ("authors" . "%-20s ")\r
+ ("subject" . "%s ")\r
+ ("tags" . "(%s)"))\r
+- "Search result formating. Supported fields are:\r
++ "Search result formatting. Supported fields are:\r
+ date, count, authors, subject, tags\r
+ For example:\r
+ (setq notmuch-search-result-format \(\(\"authors\" . \"%-40s\"\)\r
+@@ -493,7 +493,7 @@ the messages that are about to be tagged"\r
+ :group 'notmuch)\r
+ \r
+ (defcustom notmuch-after-tag-hook nil\r
+- "Hooks that are run before tags of a message are modified.\r
++ "Hooks that are run after tags of a message are modified.\r
+ \r
+ 'tags' will contain the tags that were added or removed as\r
+ a list of strings of the form \"+TAG\" or \"-TAG\".\r
+@@ -836,7 +836,7 @@ non-authors is found, assume that all of the authors match."\r
+ (defun notmuch-search-operate-all (action)\r
+ "Add/remove tags from all matching messages.\r
+ \r
+-Tis command adds or removes tags from all messages matching the\r
++This command adds or removes tags from all messages matching the\r
+ current search terms. When called interactively, this command\r
+ will prompt for tags to be added or removed. Tags prefixed with\r
+ '+' will be added and tags prefixed with '-' will be removed.\r
+diff --git a/gmime-filter-headers.h b/gmime-filter-headers.h\r
+index 47d1d45..1d1a3eb 100644\r
+--- a/gmime-filter-headers.h\r
++++ b/gmime-filter-headers.h\r
+@@ -39,7 +39,7 @@ typedef struct _GMimeFilterHeadersClass GMimeFilterHeadersClass;\r
+ * @parent_object: parent #GMimeFilter\r
+ * @saw_nl: previous char was a \n\r
+ * @line: temporary buffer for line unfolding\r
+- * @line_size: size of currently allocated nemory for @line\r
++ * @line_size: size of currently allocated memory for @line\r
+ * @lineptr: pointer to the first unused character in @line\r
+ *\r
+ * A filter to decode rfc2047 encoded headers\r
+diff --git a/lib/Makefile b/lib/Makefile\r
+index b6859ea..de492a7 100644\r
+--- a/lib/Makefile\r
++++ b/lib/Makefile\r
+@@ -1,4 +1,4 @@\r
+-# See Makfefile.local for the list of files to be compiled in this\r
++# See Makefile.local for the list of files to be compiled in this\r
+ # directory.\r
+ all:\r
+ $(MAKE) -C .. all\r
+diff --git a/lib/Makefile.local b/lib/Makefile.local\r
+index 4319023..d06f268 100644\r
+--- a/lib/Makefile.local\r
++++ b/lib/Makefile.local\r
+@@ -82,7 +82,7 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME)\r
+ \r
+ install: install-$(dir)\r
+ \r
+-# The (often-reused) $dir works fine within targets/pre-requisites,\r
++# The (often-reused) $dir works fine within targets/prerequisites,\r
+ # but cannot be used reliably within commands, so copy its value to a\r
+ # variable that is not reused.\r
+ lib := $(dir)\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 7f79cf4..9c2f4ec 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -69,7 +69,7 @@ typedef struct {\r
+ *\r
+ * Multiple terms of given prefix:\r
+ *\r
+- * reference: All message IDs from In-Reply-To and Re ferences\r
++ * reference: All message IDs from In-Reply-To and References\r
+ * headers in the message.\r
+ *\r
+ * tag: Any tags associated with this message by the user.\r
+@@ -137,7 +137,7 @@ typedef struct {\r
+ * ASCII integer. The initial database version\r
+ * was 1, (though a schema existed before that\r
+ * were no "version" database value existed at\r
+- * all). Succesive versions are allocated as\r
++ * all). Successive versions are allocated as\r
+ * changes are made to the database (such as by\r
+ * indexing new fields).\r
+ *\r
+@@ -148,7 +148,7 @@ typedef struct {\r
+ * incremented for each thread ID.\r
+ *\r
+ * thread_id_* A pre-allocated thread ID for a particular\r
+- * message. This is actually an arbitarily large\r
++ * message. This is actually an arbitrarily large\r
+ * family of metadata name. Any particular name is\r
+ * formed by concatenating "thread_id_" with a message\r
+ * ID (or the SHA1 sum of a message ID if it is very\r
+@@ -422,7 +422,7 @@ skip_space_and_comments (const char **str)\r
+ }\r
+ \r
+ /* Parse an RFC 822 message-id, discarding whitespace, any RFC 822\r
+- * comments, and the '<' and '>' delimeters.\r
++ * comments, and the '<' and '>' delimiters.\r
+ *\r
+ * If not NULL, then *next will be made to point to the first character\r
+ * not parsed, (possibly pointing to the final '\0' terminator.\r
+@@ -1149,7 +1149,7 @@ _notmuch_database_filename_to_direntry (void *ctx,\r
+ \r
+ /* Given a legal 'path' for the database, return the relative path.\r
+ *\r
+- * The return value will be a pointer to the originl path contents,\r
++ * The return value will be a pointer to the original path contents,\r
+ * and will be either the original string (if 'path' was relative) or\r
+ * a portion of the string (if path was absolute and begins with the\r
+ * database path).\r
+@@ -1476,7 +1476,7 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch,\r
+ * In all cases, we assign to the current message the first thread_id\r
+ * found (through either parent or child). We will also merge any\r
+ * existing, distinct threads where this message belongs to both,\r
+- * (which is not uncommon when mesages are processed out of order).\r
++ * (which is not uncommon when messages are processed out of order).\r
+ *\r
+ * Finally, if no thread ID has been found through parent or child, we\r
+ * call _notmuch_message_generate_thread_id to generate a new thread\r
+diff --git a/lib/libsha1.c b/lib/libsha1.c\r
+index c39a5a1..5d16f6a 100644\r
+--- a/lib/libsha1.c\r
++++ b/lib/libsha1.c\r
+@@ -174,7 +174,7 @@ void sha1_hash(const unsigned char data[], unsigned long len, sha1_ctx ctx[1])\r
+ if((ctx->count[0] += len) < len)\r
+ ++(ctx->count[1]);\r
+ \r
+- while(len >= space) /* tranfer whole blocks if possible */\r
++ while(len >= space) /* transfer whole blocks if possible */\r
+ {\r
+ memcpy(((unsigned char*)ctx->wbuf) + pos, sp, space);\r
+ sp += space; len -= space; space = SHA1_BLOCK_SIZE; pos = 0;\r
+diff --git a/lib/libsha1.h b/lib/libsha1.h\r
+index c1c848f..56f445a 100644\r
+--- a/lib/libsha1.h\r
++++ b/lib/libsha1.h\r
+@@ -38,7 +38,7 @@ extern "C"\r
+ {\r
+ #endif\r
+ #if 0\r
+-} /* Appleasing Emacs */\r
++} /* Appeasing Emacs */\r
+ #endif\r
+ \r
+ #include <stdint.h>\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 4b59fa9..7ff39ab 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -837,7 +837,7 @@ _notmuch_message_add_term (notmuch_message_t *message,\r
+ \r
+ /* Parse 'text' and add a term to 'message' for each parsed word. Each\r
+ * term will be added both prefixed (if prefix_name is not NULL) and\r
+- * also unprefixed). */\r
++ * also non-prefixed). */\r
+ notmuch_private_status_t\r
+ _notmuch_message_gen_terms (notmuch_message_t *message,\r
+ const char *prefix_name,\r
+@@ -1022,7 +1022,7 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
+ *\r
+ * A non-NULL return value is guaranteed to be a valid string pointer\r
+ * pointing to the characters "new/" or "cur/", (but not\r
+- * NUL-terminated).\r
++ * NULL-terminated).\r
+ */\r
+ static const char *\r
+ _filename_is_in_maildir (const char *filename)\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index e508309..974be8d 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -103,7 +103,7 @@ typedef enum _notmuch_status {\r
+ \r
+ /* Get a string representation of a notmuch_status_t value.\r
+ *\r
+- * The result is readonly.\r
++ * The result is read-only.\r
+ */\r
+ const char *\r
+ notmuch_status_to_string (notmuch_status_t status);\r
+@@ -510,7 +510,7 @@ notmuch_threads_move_to_next (notmuch_threads_t *threads);\r
+ *\r
+ * It's not strictly necessary to call this function. All memory from\r
+ * the notmuch_threads_t object will be reclaimed when the\r
+- * containg query object is destroyed.\r
++ * containing query object is destroyed.\r
+ */\r
+ void\r
+ notmuch_threads_destroy (notmuch_threads_t *threads);\r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index 6e4c5c4..485fa72 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -69,7 +69,7 @@ static const char maildir_config_comment[] =\r
+ "\tsynchronize_flags Valid values are true and false.\n"\r
+ "\n"\r
+ "\tIf true, then the following maildir flags (in message filenames)\n"\r
+- "\twill be syncrhonized with the corresponding notmuch tags:\n"\r
++ "\twill be synchronized with the corresponding notmuch tags:\n"\r
+ "\n"\r
+ "\t\tFlag Tag\n"\r
+ "\t\t---- -------\n"\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index 744f4ca..0fa2a3c 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -373,7 +373,7 @@ add_files_recursive (notmuch_database_t *notmuch,\r
+ /* If we're looking at a symlink, we only want to add it if it\r
+ * links to a regular file, (and not to a directory, say).\r
+ *\r
+- * Similarly, if the file is of unknown type (due to filesytem\r
++ * Similarly, if the file is of unknown type (due to filesystem\r
+ * limitations), then we also need to look closer.\r
+ *\r
+ * In either case, a stat does the trick.\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 27ef37b..362e198 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -278,7 +278,7 @@ add_recipients_from_message (GMimeMessage *reply,\r
+ * The munging is easy to detect, because it results in a\r
+ * redundant reply-to header, (with an address that already exists\r
+ * in either To or Cc). So in this case, we ignore the Reply-To\r
+- * field and use the From header. Thie ensures the original sender\r
++ * field and use the From header. This ensures the original sender\r
+ * will get the reply even if not subscribed to the list. Note\r
+ * that the address in the Reply-To header will always appear in\r
+ * the reply.\r
+@@ -362,7 +362,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message\r
+ * them indications to which email address this message was\r
+ * delivered.\r
+ * The Received: header is special in our get_header function\r
+- * and is always concated.\r
++ * and is always concatenated.\r
+ */\r
+ received = notmuch_message_get_header (message, "received");\r
+ if (received == NULL)\r
+diff --git a/notmuch.1 b/notmuch.1\r
+index c1aa4e3..5a8c83d 100644\r
+--- a/notmuch.1\r
++++ b/notmuch.1\r
+@@ -484,7 +484,7 @@ sup calls them).\r
+ \r
+ The\r
+ .B part\r
+-command can used to output a single part of a multi-part MIME message.\r
++command can used to output a single part of a multipart MIME message.\r
+ \r
+ .RS 4\r
+ .TP 4\r
+@@ -641,13 +641,13 @@ expression).\r
+ Finally, results can be restricted to only messages within a\r
+ particular time range, (based on the Date: header) with a syntax of:\r
+ \r
+- <intial-timestamp>..<final-timestamp>\r
++ <initial-timestamp>..<final-timestamp>\r
+ \r
+ Each timestamp is a number representing the number of seconds since\r
+ 1970\-01\-01 00:00:00 UTC. This is not the most convenient means of\r
+ expressing date ranges, but until notmuch is fixed to accept a more\r
+ convenient form, one can use the date program to construct\r
+-timestamps. For example, with the bash shell the folowing syntax would\r
++timestamps. For example, with the bash shell the following syntax would\r
+ specify a date range to return messages from 2009\-10\-01 until the\r
+ current time:\r
+ \r
+diff --git a/notmuch.c b/notmuch.c\r
+index 93f3194..f672695 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -48,7 +48,7 @@ static int\r
+ notmuch_help_command (void *ctx, int argc, char *argv[]);\r
+ \r
+ static const char search_terms_help[] =\r
+- "\tSeveral notmuch commands accept a comman syntax for search\n"\r
++ "\tSeveral notmuch commands accept a command syntax for search\n"\r
+ "\tterms.\n"\r
+ "\n"\r
+ "\tThe search terms can consist of free-form text (and quoted\n"\r
+diff --git a/packaging/debian b/packaging/debian\r
+index a586660..c8e8ddd 100644\r
+--- a/packaging/debian\r
++++ b/packaging/debian\r
+@@ -1,2 +1,2 @@\r
+-The debian packaging exists in the top-level "debian" directory within\r
+-this source-code respository.\r
++The Debian packaging exists in the top-level "debian" directory within\r
++this source-code repository.\r
+diff --git a/test/Makefile b/test/Makefile\r
+index b6859ea..de492a7 100644\r
+--- a/test/Makefile\r
++++ b/test/Makefile\r
+@@ -1,4 +1,4 @@\r
+-# See Makfefile.local for the list of files to be compiled in this\r
++# See Makefile.local for the list of files to be compiled in this\r
+ # directory.\r
+ all:\r
+ $(MAKE) -C .. all\r
+diff --git a/test/README b/test/README\r
+index 07da480..be75e0e 100644\r
+--- a/test/README\r
++++ b/test/README\r
+@@ -151,7 +151,7 @@ library for your script to use.\r
+ \r
+ This works similar to test_expect_equal (see above) but is used to\r
+ mark a test that demonstrates a known breakage, (that is, the\r
+- author of the test expectes "output" and "expected" to differ until\r
++ author of the test expects "output" and "expected" to differ until\r
+ the breakage is fixed). See test_expect_failure for details.\r
+ \r
+ test_debug <script>\r
+@@ -181,7 +181,7 @@ writing tests:\r
+ generate_message\r
+ \r
+ Generates a message with an optional template. Most tests will\r
+- actually prefere to call add_message. See below.\r
++ actually prefer to call add_message. See below.\r
+ \r
+ add_message\r
+ \r
+@@ -197,6 +197,6 @@ writing tests:\r
+ \r
+ This function should be called at the beginning of a test file\r
+ when a test needs to operate on a non-empty body of messages. It\r
+- will intialize the mail database to a known state of 50 sample\r
++ will initialize the mail database to a known state of 50 sample\r
+ messages, (culled from the early history of the notmuch mailing\r
+ list).\r
+diff --git a/test/crypto b/test/crypto\r
+index 8e92016..01daffe 100755\r
+--- a/test/crypto\r
++++ b/test/crypto\r
+@@ -318,7 +318,7 @@ test_expect_equal \\r
+ "$expected"\r
+ \r
+ test_begin_subtest "signature verification with revoked key"\r
+-# generate revokation certificate and load it to revoke key\r
++# generate revocation certificate and load it to revoke key\r
+ echo "y\r
+ 1\r
+ Notmuch Test Suite key revocation (automated) $(date '+%F_%T%z')\r
+diff --git a/test/maildir-sync b/test/maildir-sync\r
+index 2b43127..c99dbec 100755\r
+--- a/test/maildir-sync\r
++++ b/test/maildir-sync\r
+@@ -85,7 +85,7 @@ test_expect_equal "$output" "No new mail."\r
+ # test created directory document in the database but this document\r
+ # was not linked as subdirectory of $MAIL_DIR. Therefore notmuch new\r
+ # could not reach the cur/ directory and its files in it during\r
+-# recurive traversal.\r
++# recursive traversal.\r
+ #\r
+ # XXX: The above sounds like a bug that should be fixed. If notmuch is\r
+ # creating new directories in the mail store, then it should be\r
+diff --git a/test/multipart b/test/multipart\r
+index 0879696..2da9afa 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -209,7 +209,7 @@ Non-text part: text/html\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-test_begin_subtest "--format=text --part=5, inline attachement"\r
++test_begin_subtest "--format=text --part=5, inline attachment"\r
+ notmuch show --format=text --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ \f\r
+attachment{ ID: 5, Content-type: text/plain\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index a59d1c1..118364c 100755\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -424,7 +424,7 @@ test_begin_subtest ()\r
+ error "bug in test script: Missing test_expect_equal in ${BASH_SOURCE[1]}:${BASH_LINENO[0]}"\r
+ fi\r
+ test_subtest_name="$1"\r
+- # Remember stdout and stderr file descriptios and redirect test\r
++ # Remember stdout and stderr file descriptions and redirect test\r
+ # output to the previously prepared file descriptors 3 and 4 (see\r
+ # below)\r
+ if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi\r
+diff --git a/test/uuencode b/test/uuencode\r
+index d0d16bd..b3e1ac1 100755\r
+--- a/test/uuencode\r
++++ b/test/uuencode\r
+@@ -5,11 +5,11 @@ test_description="handling of uuencoded data"\r
+ add_message [subject]=uuencodetest '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' \\r
+ '[body]="This message is used to ensure that notmuch correctly handles a\r
+ message containing a block of uuencoded data. First, we have a marker\r
+-this content beforeuudata . Then we beging the uunencoded data itself:\r
++this content beforeuudata . Then we begin the uuencoded data itself:\r
+ \r
+ begin 644 bogus-uuencoded-data\r
+ M0123456789012345678901234567890123456789012345678901234567890\r
+-MOBVIOUSLY, THIS IS NOT ANY SORT OF USEFUL UUNECODED DATA. \r
++MOBVIOUSLY, THIS IS NOT ANY SORT OF USEFUL UUENCODED DATA. \r
+ MINSTEAD THIS IS JUST A WAY TO ENSURE THAT THIS BLOCK OF DATA \r
+ MIS CORRECTLY IGNORED WHEN NOTMUCH CREATES ITS INDEX. SO WE \r
+ MINCLUDE A DURINGUUDATA MARKER THAT SHOULD NOT RESULT IN ANY \r
+diff --git a/vim/README b/vim/README\r
+index 12ad2bb..aa3245c 100644\r
+--- a/vim/README\r
++++ b/vim/README\r
+@@ -37,7 +37,7 @@ Buffer types:\r
+ You are presented with the search results when you run :NotMuch.\r
+ \r
+ Keybindings:\r
+- <Space> - show the selected thread colapsing unmatched items\r
++ <Space> - show the selected thread collapsing unmatched items\r
+ <Enter> - show the entire selected thread\r
+ a - archive message (remove inbox tag)\r
+ f - filter the current search terms\r
+diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim\r
+index c731c47..768a011 100644\r
+--- a/vim/plugin/notmuch.vim\r
++++ b/vim/plugin/notmuch.vim\r
+@@ -765,7 +765,7 @@ function! s:NM_cmd_show_parse(inlines)\r
+ \r
+ if part_end\r
+ " FIXME: this is a hack for handling two folds being added for one line\r
+- " we should handle addinga fold in a function\r
++ " we should handle adding a fold in a function\r
+ if len(foldinfo) && foldinfo[1] < foldinfo[2]\r
+ call add(info['folds'], foldinfo[0:3])\r
+ let info['foldtext'][foldinfo[1]] = foldinfo[4]\r
+@@ -1314,7 +1314,7 @@ endfunction\r
+ function! s:NM_tag(filter, tags)\r
+ let filter = len(a:filter) ? a:filter : [<SID>NM_search_thread_id()]\r
+ if !len(filter)\r
+- throw 'Eeek! I couldn''t find the thead id!'\r
++ throw 'Eeek! I couldn''t find the thread id!'\r
+ endif\r
+ let args = ['tag']\r
+ call extend(args, a:tags)\r
+-- \r
+1.7.4.1\r
+\r
projects / notmuch-archives.git / commitdiff