From 8bb6f7869c4c98190f010d60409938b1c50c5968 Mon Sep 17 00:00:00 2001 From: Pieter Praet Date: Mon, 20 Jun 2011 22:14:21 +0200 Subject: [PATCH] fix sum moar typos [comments in source code] Various typo fixes in comments within the source code. Signed-off-by: Pieter Praet Edited-by: Carl Worth Restricted to just source-code comments, (and fixed fix of "descriptios" to "descriptors" rather than "descriptions"). --- emacs/notmuch-hello.el | 2 +- emacs/notmuch-show.el | 2 +- gmime-filter-headers.h | 2 +- lib/database.cc | 12 ++++++------ lib/libsha1.c | 2 +- lib/libsha1.h | 2 +- lib/message.cc | 2 +- lib/notmuch.h | 4 ++-- notmuch-new.c | 2 +- notmuch-reply.c | 4 ++-- test/crypto | 2 +- test/maildir-sync | 2 +- test/test-lib.sh | 2 +- vim/plugin/notmuch.vim | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 916cda1c..65fde75a 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -428,7 +428,7 @@ Complete list of currently available key bindings: (let ((found-target-pos nil) (final-target-pos nil)) (let* ((saved-alist - ;; Filter out empty saved seaches if required. + ;; Filter out empty saved searches if required. (if notmuch-show-empty-saved-searches notmuch-saved-searches (loop for elem in notmuch-saved-searches diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index af1d44b6..7e524361 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -121,7 +121,7 @@ same as that of the previous message." "Use external viewers to view all attachments from the current message." (interactive) (with-current-notmuch-show-message - ; We ovverride the mm-inline-media-tests to indicate which message + ; We override the mm-inline-media-tests to indicate which message ; parts are already sufficiently handled by the original ; presentation of the message in notmuch-show mode. These parts ; will be inserted directly into the temporary buffer of diff --git a/gmime-filter-headers.h b/gmime-filter-headers.h index 47d1d456..1d1a3ebb 100644 --- a/gmime-filter-headers.h +++ b/gmime-filter-headers.h @@ -39,7 +39,7 @@ typedef struct _GMimeFilterHeadersClass GMimeFilterHeadersClass; * @parent_object: parent #GMimeFilter * @saw_nl: previous char was a \n * @line: temporary buffer for line unfolding - * @line_size: size of currently allocated nemory for @line + * @line_size: size of currently allocated memory for @line * @lineptr: pointer to the first unused character in @line * * A filter to decode rfc2047 encoded headers diff --git a/lib/database.cc b/lib/database.cc index 7f79cf47..9c2f4ecd 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -69,7 +69,7 @@ typedef struct { * * Multiple terms of given prefix: * - * reference: All message IDs from In-Reply-To and Re ferences + * reference: All message IDs from In-Reply-To and References * headers in the message. * * tag: Any tags associated with this message by the user. @@ -137,7 +137,7 @@ typedef struct { * ASCII integer. The initial database version * was 1, (though a schema existed before that * were no "version" database value existed at - * all). Succesive versions are allocated as + * all). Successive versions are allocated as * changes are made to the database (such as by * indexing new fields). * @@ -148,7 +148,7 @@ typedef struct { * incremented for each thread ID. * * thread_id_* A pre-allocated thread ID for a particular - * message. This is actually an arbitarily large + * message. This is actually an arbitrarily large * family of metadata name. Any particular name is * formed by concatenating "thread_id_" with a message * ID (or the SHA1 sum of a message ID if it is very @@ -422,7 +422,7 @@ skip_space_and_comments (const char **str) } /* Parse an RFC 822 message-id, discarding whitespace, any RFC 822 - * comments, and the '<' and '>' delimeters. + * comments, and the '<' and '>' delimiters. * * If not NULL, then *next will be made to point to the first character * not parsed, (possibly pointing to the final '\0' terminator. @@ -1149,7 +1149,7 @@ _notmuch_database_filename_to_direntry (void *ctx, /* Given a legal 'path' for the database, return the relative path. * - * The return value will be a pointer to the originl path contents, + * The return value will be a pointer to the original path contents, * and will be either the original string (if 'path' was relative) or * a portion of the string (if path was absolute and begins with the * database path). @@ -1476,7 +1476,7 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch, * In all cases, we assign to the current message the first thread_id * found (through either parent or child). We will also merge any * existing, distinct threads where this message belongs to both, - * (which is not uncommon when mesages are processed out of order). + * (which is not uncommon when messages are processed out of order). * * Finally, if no thread ID has been found through parent or child, we * call _notmuch_message_generate_thread_id to generate a new thread diff --git a/lib/libsha1.c b/lib/libsha1.c index c39a5a17..5d16f6ab 100644 --- a/lib/libsha1.c +++ b/lib/libsha1.c @@ -174,7 +174,7 @@ void sha1_hash(const unsigned char data[], unsigned long len, sha1_ctx ctx[1]) if((ctx->count[0] += len) < len) ++(ctx->count[1]); - while(len >= space) /* tranfer whole blocks if possible */ + while(len >= space) /* transfer whole blocks if possible */ { memcpy(((unsigned char*)ctx->wbuf) + pos, sp, space); sp += space; len -= space; space = SHA1_BLOCK_SIZE; pos = 0; diff --git a/lib/libsha1.h b/lib/libsha1.h index c1c848fc..56f445a9 100644 --- a/lib/libsha1.h +++ b/lib/libsha1.h @@ -38,7 +38,7 @@ extern "C" { #endif #if 0 -} /* Appleasing Emacs */ +} /* Appeasing Emacs */ #endif #include diff --git a/lib/message.cc b/lib/message.cc index 4b59fa91..8b9c84f9 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -837,7 +837,7 @@ _notmuch_message_add_term (notmuch_message_t *message, /* Parse 'text' and add a term to 'message' for each parsed word. Each * term will be added both prefixed (if prefix_name is not NULL) and - * also unprefixed). */ + * also non-prefixed). */ notmuch_private_status_t _notmuch_message_gen_terms (notmuch_message_t *message, const char *prefix_name, diff --git a/lib/notmuch.h b/lib/notmuch.h index e508309e..974be8d1 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -103,7 +103,7 @@ typedef enum _notmuch_status { /* Get a string representation of a notmuch_status_t value. * - * The result is readonly. + * The result is read-only. */ const char * notmuch_status_to_string (notmuch_status_t status); @@ -510,7 +510,7 @@ notmuch_threads_move_to_next (notmuch_threads_t *threads); * * It's not strictly necessary to call this function. All memory from * the notmuch_threads_t object will be reclaimed when the - * containg query object is destroyed. + * containing query object is destroyed. */ void notmuch_threads_destroy (notmuch_threads_t *threads); diff --git a/notmuch-new.c b/notmuch-new.c index 744f4ca3..0fa2a3cb 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -373,7 +373,7 @@ add_files_recursive (notmuch_database_t *notmuch, /* If we're looking at a symlink, we only want to add it if it * links to a regular file, (and not to a directory, say). * - * Similarly, if the file is of unknown type (due to filesytem + * Similarly, if the file is of unknown type (due to filesystem * limitations), then we also need to look closer. * * In either case, a stat does the trick. diff --git a/notmuch-reply.c b/notmuch-reply.c index 27ef37bd..362e1987 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -278,7 +278,7 @@ add_recipients_from_message (GMimeMessage *reply, * The munging is easy to detect, because it results in a * redundant reply-to header, (with an address that already exists * in either To or Cc). So in this case, we ignore the Reply-To - * field and use the From header. Thie ensures the original sender + * field and use the From header. This ensures the original sender * will get the reply even if not subscribed to the list. Note * that the address in the Reply-To header will always appear in * the reply. @@ -362,7 +362,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message * them indications to which email address this message was * delivered. * The Received: header is special in our get_header function - * and is always concated. + * and is always concatenated. */ received = notmuch_message_get_header (message, "received"); if (received == NULL) diff --git a/test/crypto b/test/crypto index 8e920167..01daffe7 100755 --- a/test/crypto +++ b/test/crypto @@ -318,7 +318,7 @@ test_expect_equal \ "$expected" test_begin_subtest "signature verification with revoked key" -# generate revokation certificate and load it to revoke key +# generate revocation certificate and load it to revoke key echo "y 1 Notmuch Test Suite key revocation (automated) $(date '+%F_%T%z') diff --git a/test/maildir-sync b/test/maildir-sync index 2b43127e..c99dbec8 100755 --- a/test/maildir-sync +++ b/test/maildir-sync @@ -85,7 +85,7 @@ test_expect_equal "$output" "No new mail." # test created directory document in the database but this document # was not linked as subdirectory of $MAIL_DIR. Therefore notmuch new # could not reach the cur/ directory and its files in it during -# recurive traversal. +# recursive traversal. # # XXX: The above sounds like a bug that should be fixed. If notmuch is # creating new directories in the mail store, then it should be diff --git a/test/test-lib.sh b/test/test-lib.sh index a59d1c13..cc20f414 100755 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -424,7 +424,7 @@ test_begin_subtest () error "bug in test script: Missing test_expect_equal in ${BASH_SOURCE[1]}:${BASH_LINENO[0]}" fi test_subtest_name="$1" - # Remember stdout and stderr file descriptios and redirect test + # Remember stdout and stderr file descriptors and redirect test # output to the previously prepared file descriptors 3 and 4 (see # below) if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim index c731c471..e5787f07 100644 --- a/vim/plugin/notmuch.vim +++ b/vim/plugin/notmuch.vim @@ -765,7 +765,7 @@ function! s:NM_cmd_show_parse(inlines) if part_end " FIXME: this is a hack for handling two folds being added for one line - " we should handle addinga fold in a function + " we should handle adding a fold in a function if len(foldinfo) && foldinfo[1] < foldinfo[2] call add(info['folds'], foldinfo[0:3]) let info['foldtext'][foldinfo[1]] = foldinfo[4]