fix typos in comments

diff --git a/compose.c b/compose.c
index 1b329671bd6a6d011c68be8a2ef3baeb62e9ca45..9cfa2d404257e2ecaa652cd7e8cf17144117b3db 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -1264,7 +1264,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
 
     }
 
-    /* Draw formated compose status line */
+    /* Draw formatted compose status line */
     if (menu->redraw & REDRAW_STATUS) 
     {
        compose_status_line (buf, sizeof (buf), 0, menu, NONULL(ComposeFormat));

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 3e2cf319294190dd390f0dddf3d6255259fc4625..6a404727f40ea23ad508c25f231075cfa4f4aabe 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -587,7 +587,7 @@ static gpgme_key_t *create_recipient_set (const char *keylist,
          {
            if (i>1 && buf[i-1] == '!') 
              {
-               /* The user selected to override the valididy of that
+               /* The user selected to override the validity of that
                   key. */
                buf[i-1] = 0;
            
@@ -1217,7 +1217,7 @@ static void show_fingerprint (gpgme_key_t key, STATE *state)
   FREE (&buf);
 }
 
-/* Show the valididy of a key used for one signature. */
+/* Show the validity of a key used for one signature. */
 static void show_one_sig_validity (gpgme_ctx_t ctx, int idx, STATE *s)
 {
   gpgme_verify_result_t result = NULL;
@@ -1288,8 +1288,8 @@ static void print_smime_keyinfo (const char* msg, gpgme_signature_t sig,
   state_attach_puts ("\n", s);  
 }
 
-/* Show information about one signature.  This fucntion is called with
-   the context CTX of a sucessful verification operation and the
+/* Show information about one signature.  This function is called with
+   the context CTX of a successful verification operation and the
    enumerator IDX which should start at 0 and incremete for each
    call/signature. 
 
@@ -1783,7 +1783,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur)
          an ugly way of doing it but we have anyway a problem with
          arbitrary encoded S/MIME messages: Only the outer part may be
          encrypted.  The entire mime parsing should be revamped,
-         probably by keeping the temportary files so that we don't
+         probably by keeping the temporary files so that we don't
          need to decrypt them all the time.  Inner parts of an
          encrypted part can then pint into this file and tehre won't
          never be a need to decrypt again.  This needs a partial
@@ -2785,7 +2785,7 @@ static const char *crypt_entry_fmt (char *dest,
   return (src);
 }
       
-/* Used by the display fucntion to format a line. */
+/* Used by the display function to format a line. */
 static void crypt_entry (char *s, size_t l, MUTTMENU * menu, int num)
 {
   crypt_key_t **key_table = (crypt_key_t **) menu->data;

diff --git a/crypt-mod.h b/crypt-mod.h
index 08dfa43c41408123d5545772410b1551def6b947..1e284a0bd82a02e163e41d1ca1027589ea9c4316 100644 (file)
--- a/crypt-mod.h
+++ b/crypt-mod.h
@@ -26,7 +26,7 @@
 
 
 /* 
-    Type defintions for crypto module functions.
+    Type definitions for crypto module functions.
  */
 typedef void (*crypt_func_void_passphrase_t) (void);
 typedef int (*crypt_func_valid_passphrase_t)  (void);
@@ -107,7 +107,7 @@ typedef struct crypt_module_functions
 
 
 /*
-   A structure to decribe a crypto module. 
+   A structure to describe a crypto module. 
  */
 typedef struct crypt_module_specs
 {

diff --git a/curs_lib.c b/curs_lib.c
index 5a294c99b4b70e7814c7c2bf0e48290fcc33c927..355c899afb39cc70b737478a54308ec12bfa31a9 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -67,7 +67,7 @@ void mutt_refresh (void)
 }
 
 /* Make sure that the next refresh does a full refresh.  This could be
-   optmized by not doing it at all if DISPLAY is set as this might
+   optimized by not doing it at all if DISPLAY is set as this might
    indicate that a GUI based pinentry was used.  Having an option to
    customize this is of course the Mutt way.  */
 void mutt_need_hard_redraw (void)

diff --git a/date.c b/date.c
index 0cd831228ab61a8d0d444f68b3fba92c13249ed3..c173fe6525549be8999dd6f9e1f8114f2ac53af5 100644 (file)
--- a/date.c
+++ b/date.c
@@ -77,7 +77,7 @@ time_t mutt_mktime (struct tm *t, int local)
   g = AccumDaysPerMonth [t->tm_mon % 12];
 
   /* The leap years are 1972 and every 4. year until 2096,
-   * but this algoritm will fail after year 2099 */
+   * but this algorithm will fail after year 2099 */
   g += t->tm_mday;
   if ((t->tm_year % 4) || t->tm_mon < 2)
     g--;

diff --git a/doc/makedoc.c b/doc/makedoc.c
index 3a06bf27d066098620427f01a48a05be05ba5cbd..9d1d3b7c0fa46e3ece0b81b093e5c6698e84a5d9 100644 (file)
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -750,7 +750,7 @@ static void print_confline (const char *varname, int type, const char *val, FILE
  ** - .dt starts a term in a definition list.
  ** - .dd starts a definition in a definition list.
  ** - .de on a line finishes a definition list.
- ** - .il on a line starts an itemzied list
+ ** - .il on a line starts an itemized list
  ** - .dd starts an item in an itemized list
  ** - .ie on a line finishes an itemized list
  ** - .ts on a line starts a "tscreen" environment (name taken from SGML).

diff --git a/editmsg.c b/editmsg.c
index 153b1397a9cfd471b9cab9d6b985f68731be3815..2d916a0d43f2f994223e30b50faaff441e1700c5 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -163,7 +163,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur)
 
   /* 
    * XXX - we have to play games with the message flags to avoid
-   * problematic behaviour with maildir folders.
+   * problematic behavior with maildir folders.
    *
    */
 

diff --git a/handler.c b/handler.c
index 08ff98485fa7031a5ce2d21c0ae4a50fbf16dcf4..449fd3587e1c3ae3d477b8d7695b1c49b59e3dc3 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -970,7 +970,7 @@ static int mutt_is_autoview (BODY *b)
     }
     else
     {
-      /* determine if this type is on ther user's auto_view list */
+      /* determine if this type is on there user's auto_view list */
       LIST *t = AutoViewList;
 
       for (; t; t = t->next) {
@@ -1019,7 +1019,7 @@ static int alternative_handler (BODY *a, STATE *s)
 
   a = b;
 
-  /* First, search list of prefered types */
+  /* First, search list of preferred types */
   t = AlternativeOrderList;
   while (t && !choice)
   {

diff --git a/imap/util.c b/imap/util.c
index 657a2fb92b5a002ab8c28ca02fcbaa2f959fb277..6295c5ff43e1133e748cbb7b87047bffedf1f421 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -161,7 +161,7 @@ int imap_hcache_del (IMAP_DATA* idata, unsigned int uid)
 #endif
 
 /* imap_parse_path: given an IMAP mailbox name, return host, port
- *   and a path IMAP servers will recognise.
+ *   and a path IMAP servers will recognize.
  * mx.mbox is malloc'd, caller must free it */
 int imap_parse_path (const char* path, IMAP_MBOX* mx)
 {

diff --git a/init.c b/init.c
index a3ec23258ab39ba9fb0e61e4ca47f6693e293a55..0c73d57558522564a4cf00f0e8375e86ab2cc138 100644 (file)
--- a/init.c
+++ b/init.c
@@ -259,7 +259,7 @@ int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags)
       safe_fclose (&fp);
       mutt_wait_filter (pid);
 
-      /* if we got output, make a new string consiting of the shell ouptput
+      /* if we got output, make a new string consiting of the shell output
         plus whatever else was left on the original line */
       /* BUT: If this is inside a quoted string, directly add output to 
        * the token */
@@ -2468,7 +2468,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     if (Completed[0] == 0 && User_typed[0])
       return 0;
 
-     /* Num_matched will _always_ be atleast 1 since the initial
+     /* Num_matched will _always_ be at least 1 since the initial
       * user-typed string is always stored */
     if (numtabs == 1 && Num_matched == 2)
       snprintf(Completed, sizeof(Completed),"%s", Matches[0]);
@@ -2524,7 +2524,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     if (Completed[0] == 0 && User_typed[0])
       return 0;
 
-    /* Num_matched will _always_ be atleast 1 since the initial
+    /* Num_matched will _always_ be at least 1 since the initial
      * user-typed string is always stored */
     if (numtabs == 1 && Num_matched == 2)
       snprintf(Completed, sizeof(Completed),"%s", Matches[0]);
@@ -2571,7 +2571,7 @@ int mutt_command_complete (char *buffer, size_t len, int pos, int numtabs)
     if (Completed[0] == 0 && User_typed[0])
       return 0;
 
-    /* Num_matched will _always_ be atleast 1 since the initial
+    /* Num_matched will _always_ be at least 1 since the initial
      * user-typed string is always stored */
     if (numtabs == 1 && Num_matched == 2)
       snprintf(Completed, sizeof(Completed),"%s", Matches[0]);

diff --git a/intl/gettextP.h b/intl/gettextP.h
index 9016b72e3f6c22bfa3c311742420b3dd16eb6e46..f884cd46a939bf76f0bac35894c8ec21b740770b 100644 (file)
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -94,8 +94,8 @@ struct expression
     greater_than,              /* Comparison.  */
     less_or_equal,             /* Comparison.  */
     greater_or_equal,          /* Comparison.  */
-    equal,                     /* Comparision for equality.  */
-    not_equal,                 /* Comparision for inequality.  */
+    equal,                     /* Comparison for equality.  */
+    not_equal,                 /* Comparison for inequality.  */
     land,                      /* Logical AND.  */
     lor,                       /* Logical OR.  */
     /* Ternary operators:  */

diff --git a/intl/plural.c b/intl/plural.c
index 729574f6e784374334e9a2f5fea25e6d116e3478..30059a0fa4af655cd3339a7b6249df4844f19cf0 100644 (file)
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -345,7 +345,7 @@ static const short yycheck[] = {     1,
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
 #define YYSTACK_USE_ALLOCA
 #include <alloca.h>
-#else /* not sparc */
+#else /* not SPARC */
 /* We think this test detects Watcom and Microsoft C.  */
 /* This used to test MSDOS, but that is a bad idea
    since that symbol is in the user namespace.  */
@@ -371,7 +371,7 @@ static const short yycheck[] = {     1,
 #endif
 #endif /* not _AIX */
 #endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
+#endif /* not SPARC */
 #endif /* not GNU C */
 #endif /* alloca not defined */
 #endif /* YYSTACK_USE_ALLOCA not defined */

diff --git a/keymap.c b/keymap.c
index 56ec05d3eb0cf88d25b02c8972a8b26b774c100b..f1e55f5c07ec77990df01f1a1dd8b2338d608a34 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -408,7 +408,7 @@ static int retry_generic (int menu, keycode_t *keys, int keyslen, int lastkey)
 /* return values:
  *     >0              function to execute
  *     OP_NULL         no function bound to key sequence
- *     -1              error occured while reading input
+ *     -1              error occurred while reading input
  */
 int km_dokey (int menu)
 {

diff --git a/lib.c b/lib.c
index b80a997b1b70771653734295b4bcb06dadd2f9b8..c7d95af7c8a514b9a04d139f167986981d181902 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -787,7 +787,7 @@ char *mutt_read_line (char *s, size_t *size, FILE *fp, int *line, int flags)
       }
       else
       {
-        ungetc (c, fp); /* undo our dammage */
+        ungetc (c, fp); /* undo our damage */
         /* There wasn't room for the line -- increase ``s'' */
         offset = *size - 1; /* overwrite the terminating 0 */
         *size += STRING;

diff --git a/mbox.c b/mbox.c
index 2af4dd22a0be8972925e65ce817efffaede7e8d9..253061a424f13c0e0c1ef50dbd56403407a8e007 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -978,7 +978,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint)
 
   if (fclose (ctx->fp) != 0 || i == -1)
   {
-    /* error occured while writing the mailbox back, so keep the temp copy
+    /* error occurred while writing the mailbox back, so keep the temp copy
      * around
      */
     

diff --git a/mkdtemp.c b/mkdtemp.c
index 0f5edcdd6e0ed836a25ed893c359aec4d06fc578..ae9d5d9e82f0331b7b81f544250d982d6b7d0de7 100644 (file)
--- a/mkdtemp.c
+++ b/mkdtemp.c
@@ -6,7 +6,7 @@
 #include <time.h>
 #include <string.h>
 
-/* mkdtemp fuction for systems which don't have one */
+/* mkdtemp function for systems which don't have one */
 char *mkdtemp (char *tmpl)
 {
     static const char LETTERS[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

diff --git a/mutt.h b/mutt.h
index 041975e5da47a99dc3e4beec14777ce34c5994f8..06e3c8cd696a89efe93219e441983fc2ec6e605f 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -481,7 +481,7 @@ enum
 
   /* pseudo options */
 
-  OPTAUXSORT,          /* (pseudo) using auxillary sort function */
+  OPTAUXSORT,          /* (pseudo) using auxiliary sort function */
   OPTFORCEREFRESH,     /* (pseudo) refresh even during macros */
   OPTLOCALES,          /* (pseudo) set if user has valid locale definition */
   OPTNOCURSES,         /* (pseudo) when sending in batch mode */
@@ -889,7 +889,7 @@ typedef struct _context
   unsigned int locked : 1;     /* is the mailbox locked? */
   unsigned int changed : 1;    /* mailbox has been modified */
   unsigned int readonly : 1;    /* don't allow changes to the mailbox */
-  unsigned int dontwrite : 1;   /* dont write the mailbox on close */
+  unsigned int dontwrite : 1;   /* don't write the mailbox on close */
   unsigned int append : 1;     /* mailbox is opened in append mode */
   unsigned int quiet : 1;      /* inhibit status messages? */
   unsigned int collapsed : 1;   /* are all threads collapsed? */

diff --git a/mutt_menu.h b/mutt_menu.h
index 6ca70d79eabbde54b59e6666c6568330a5729ace..d459bef582ade8c743beffc4f60a30ee0eccda5f 100644 (file)
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -50,7 +50,7 @@ typedef struct menu_t
   int pagelen; /* number of entries per screen */
   int tagprefix;
 
-  /* Setting dialog != NULL overrides normal menu behaviour. 
+  /* Setting dialog != NULL overrides normal menu behavior. 
    * In dialog mode menubar is hidden and prompt keys are checked before
    * normal menu movement keys. This can cause problems with scrolling, if 
    * prompt keys override movement keys.

diff --git a/mutt_ssl.c b/mutt_ssl.c
index ea758710a95d264f2471b6b3af4c405ace0a1697..ca6f42914c90c1793b0d90ffed2f001e3cbf715c 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -377,7 +377,7 @@ static int ssl_socket_open (CONNECTION * conn)
   return 0;
 }
 
-/* ssl_negotiate: After SSL state has been initialised, attempt to negotiate
+/* ssl_negotiate: After SSL state has been initialized, attempt to negotiate
  *   SSL over the wire, including certificate checks. */
 static int ssl_negotiate (CONNECTION *conn, sslsockdata* ssldata)
 {

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 970a9c90b7ec27d13df9eacb9c45373149e0d5ca..b86820289d1e75349a7c779be63b51bd91ad9d2b 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -244,7 +244,7 @@ err_crt:
  */
 static int protocol_priority[] = {GNUTLS_TLS1_2, GNUTLS_TLS1_1, GNUTLS_TLS1, GNUTLS_SSL3, 0};
 
-/* tls_negotiate: After TLS state has been initialised, attempt to negotiate
+/* tls_negotiate: After TLS state has been initialized, attempt to negotiate
  *   TLS over the wire, including certificate checks. */
 static int tls_negotiate (CONNECTION * conn)
 {

diff --git a/muttlib.c b/muttlib.c
index 7e93a3a27391bff28aa7dfdaaf96ba181b32f37a..78c34de92dc15a7387931154a8f4f7cf696d1847 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1744,7 +1744,7 @@ void mutt_buffer_free (BUFFER **p)
    FREE(p);            /* __FREE_CHECKED__ */
 }
 
-/* dynamically grows a BUFFER to accomodate s, in increments of 128 bytes.
+/* dynamically grows a BUFFER to accommodate s, in increments of 128 bytes.
  * Always one byte bigger than necessary for the null terminator, and
  * the buffer is always null-terminated */
 void mutt_buffer_add (BUFFER* buf, const char* s, size_t len)

diff --git a/mx.c b/mx.c
index 7e5271429a0f40f789c4ec2b02e18cecd4a6c704..f599f6c77ef71205e153b4a5ae58a82f78042ae3 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1213,7 +1213,7 @@ static int imap_open_new_message (MESSAGE *msg, CONTEXT *dest, HEADER *hdr)
 #endif
 
 /* args:
- *     dest    destintation mailbox
+ *     dest    destination mailbox
  *     hdr     message being copied (required for maildir support, because
  *             the filename depends on the message flags)
  */

diff --git a/parse.c b/parse.c
index b5566598b75366d344c5735722ef438ef24321e0..58c777474d1fceea02bb708a3a16adcbd9805fa4 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -179,7 +179,7 @@ static PARAMETER *parse_parameters (const char *s)
        for (i=0; *s && i < sizeof (buffer) - 1; i++, s++)
        {
          if (AssumedCharset && *AssumedCharset) {
-            /* As iso-2022-* has a characer of '"' with non-ascii state,
+            /* As iso-2022-* has a character of '"' with non-ascii state,
             * ignore it. */
             if (*s == 0x1b && i < sizeof (buffer) - 2)
             {
@@ -1359,7 +1359,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs,
        continue; /* just ignore */
       else if (is_from (line, return_path, sizeof (return_path), &t))
       {
-       /* MH somtimes has the From_ line in the middle of the header! */
+       /* MH sometimes has the From_ line in the middle of the header! */
        if (hdr && !hdr->received)
          hdr->received = t - mutt_local_tz (t);
        continue;

diff --git a/pattern.c b/pattern.c
index 55841b3d028535753114667f4960923cc7eeb533..281c7ec34473c0d84f16a2625d43202c203965f7 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -646,7 +646,7 @@ static int eat_date (pattern_t *pat, BUFFER *s, BUFFER *err)
     int untilNow = FALSE;
     if (isdigit ((unsigned char)*pc))
     {
-      /* mininum date specified */
+      /* minimum date specified */
       if ((pc = getDate (pc, &min, err)) == NULL)
       {
        FREE (&buffer.data);
@@ -1499,7 +1499,7 @@ int mutt_search_command (int cur, int op)
     h = Context->hdrs[Context->v2r[i]];
     if (h->searched)
     {
-      /* if we've already evaulated this message, use the cached value */
+      /* if we've already evaluated this message, use the cached value */
       if (h->matched)
       {
        mutt_clear_error();

diff --git a/pop.c b/pop.c
index 90d95b907609b1fa1d8f38adb3863915f5e4bc40..5b9b52a37b1610fda8f65dc6d939051062dc04ad 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -56,7 +56,7 @@ static int fetch_message (char *line, void *file)
  * Read header
  * returns:
  *  0 on success
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid command or execution error,
  * -3 - error writing to tempfile
  */
@@ -229,7 +229,7 @@ static header_cache_t *pop_hcache_open (POP_DATA *pop_data, const char *path)
  * Read headers
  * returns:
  *  0 on success
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid command or execution error,
  * -3 - error writing to tempfile
  */

diff --git a/pop_auth.c b/pop_auth.c
index 62663438cca477c6a251b500f4bf3ceb8fbc473e..9943b12026f6afb92895a11716c9ad7a661bf45d 100644 (file)
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -142,7 +142,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA *pop_data, const char *method)
 bail:
   sasl_dispose (&saslconn);
 
-  /* terminate SASL sessoin if the last responce is not +OK nor -ERR */
+  /* terminate SASL sessoin if the last response is not +OK nor -ERR */
   if (!mutt_strncmp (inbuf, "+ ", 2))
   {
     snprintf (buf, sizeof (buf), "*\r\n");
@@ -289,7 +289,7 @@ static const pop_auth_t pop_authenticators[] = {
 /*
  * Authentication
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - login failed,
  * -3 - authentication canceled.
 */

diff --git a/pop_lib.c b/pop_lib.c
index b7baf700f4dea157d847add044fd7fe7b7bbd410..7082d8dd9c82a908e361e87681dad505e64e0754 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -145,7 +145,7 @@ static int fetch_auth (char *line, void *data)
 /*
  * Get capabilities
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - execution error.
 */
 static int pop_capabilities (POP_DATA *pop_data, int mode)
@@ -223,7 +223,7 @@ static int pop_capabilities (POP_DATA *pop_data, int mode)
 /*
  * Open connection
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid response.
 */
 int pop_connect (POP_DATA *pop_data)
@@ -256,7 +256,7 @@ int pop_connect (POP_DATA *pop_data)
 /*
  * Open connection and authenticate
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid command or execution error,
  * -3 - authentication canceled.
 */
@@ -412,7 +412,7 @@ void pop_logout (CONTEXT *ctx)
 /*
  * Send data from buffer and receive answer to the same buffer
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid command or execution error.
 */
 int pop_query_d (POP_DATA *pop_data, char *buf, size_t buflen, char *msg)
@@ -424,7 +424,7 @@ int pop_query_d (POP_DATA *pop_data, char *buf, size_t buflen, char *msg)
     return -1;
 
 #ifdef DEBUG
-    /* print msg instaed of real command */
+    /* print msg instead of real command */
     if (msg)
     {
       dbg = M_SOCK_LOG_FULL;
@@ -455,7 +455,7 @@ int pop_query_d (POP_DATA *pop_data, char *buf, size_t buflen, char *msg)
  * funct(NULL, *data)  if  rewind(*data)  needs, exits when fail or done.
  * Returned codes:
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid command or execution error,
  * -3 - error in funct(*line, *data)
  */

diff --git a/recvcmd.c b/recvcmd.c
index 4ae7d68609702681c52b5ab0623a145107241380..a6a3a91fbac9aeb2025b6b6d900bc78a0b7fca3d 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -565,7 +565,7 @@ _("Can't decode all tagged attachments.  MIME-forward the others?"))) == -1)
 /* 
  * Forward one or several message-type attachments. This 
  * is different from the previous function
- * since we want to mimic the index menu's behaviour.
+ * since we want to mimic the index menu's behavior.
  *
  * Code reuse from ci_send_message is not possible here -
  * ci_send_message relies on a context structure to find messages,

diff --git a/regex.c b/regex.c
index 4041e1864b0c6d659f92b334a78d0c1a5ca62133..f46c8069690cd58915c6d4c0e028cb08cdefeb43 100644 (file)
--- a/regex.c
+++ b/regex.c
@@ -78,7 +78,7 @@
 #include <sys/types.h>
 #endif
 
-/* For platform which support the ISO C amendement 1 functionality we
+/* For platform which support the ISO C amendment 1 functionality we
    support user defined character classes.  */
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
@@ -1719,7 +1719,7 @@ typedef struct
 
 #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
 /* The GNU C library provides support for user-defined character classes
-   and the functions from ISO C amendement 1.  */
+   and the functions from ISO C amendment 1.  */
 # ifdef CHARCLASS_NAME_MAX
 #  define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
 # else

diff --git a/send.c b/send.c
index 09f51b0b0e2c9c48f1ba7f1175e2672fb5bff5b2..c9a834c916617fe6c34f6b22f6f8454ba0f1c055 100644 (file)
--- a/send.c
+++ b/send.c
@@ -481,7 +481,7 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
       /* If the Reply-To: address is a mailing list, assume that it was
        * put there by the mailing list, and use the From: address
        * 
-       * We also take the from header if our correspondant has a reply-to
+       * We also take the from header if our correspondent has a reply-to
        * header which is identical to the electronic mail address given
        * in his From header.
        * 
@@ -1270,7 +1270,7 @@ ci_send_message (int flags,               /* send mode */
     /* the from address must be set here regardless of whether or not
      * $use_from is set so that the `~P' (from you) operator in send-hook
      * patterns will work.  if $use_from is unset, the from address is killed
-     * after send-hooks are evaulated */
+     * after send-hooks are evaluated */
 
     if (!msg->env->from)
     {

diff --git a/signal.c b/signal.c
index acb29723583a3513b3c47f54e6a8db9a1770ddf5..306aae8c84c6acf0184c2372f7d1833be953a509 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -128,7 +128,7 @@ void mutt_signal_init (void)
 
   /* we want SIGALRM to abort the current syscall, so we do this before
    * setting the SA_RESTART flag below.  currently this is only used to
-   * timeout on a connect() call in a reasonable amout of time.
+   * timeout on a connect() call in a reasonable amount of time.
    */
   sigaction (SIGALRM, &act, NULL);
 

diff --git a/smime.c b/smime.c
index 2ee7b4a1a5c9f70ea2ef06082ec11db5821ce61a..3337c7290f97f0071d7f42f484081b8328501b81 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -635,7 +635,7 @@ char *smime_get_field_from_db (char *mailbox, char *query, short public, short m
 
 /* 
    This sets the '*ToUse' variables for an upcoming decryption, where
-   the reuquired key is different from SmimeDefaultKey.
+   the required key is different from SmimeDefaultKey.
 */
 
 void _smime_getkeys (char *mailbox)

diff --git a/snprintf.c b/snprintf.c
index d370939aeb2e00a696f2eb7797c68c1c91816c0d..cd2e3852382bc1fa1338aae5b11bef90a37b2c8a 100644 (file)
--- a/snprintf.c
+++ b/snprintf.c
@@ -23,7 +23,7 @@
  *    probably requires libm on most operating systems.  Don't yet
  *    support the exponent (e,E) and sigfig (g,G).  Also, fmtint()
  *    was pretty badly broken, it just wasn't being exercised in ways
- *    which showed it, so that's been fixed.  Also, formated the code
+ *    which showed it, so that's been fixed.  Also, formatted the code
  *    to mutt conventions, and removed dead code left over from the
  *    original.  Also, there is now a builtin-test, just compile with:
  *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
@@ -41,7 +41,7 @@
  *  Holger Weiss <holger@zedat.fu-berlin.de> 07/23/06 for mutt 1.5.13
  *    A C99 compliant [v]snprintf() returns the number of characters that
  *    would have been written to a sufficiently sized buffer (excluding
- *    the '\0').  Mutt now relies on this behaviour, but the original
+ *    the '\0').  Mutt now relies on this behavior, but the original
  *    code simply returned the length of the resulting output string, so
  *    that's been fixed.
  *

diff --git a/sort.h b/sort.h
index 0605b55361f743cdff0a743b97af5657a5dc6909..f2832b21ea28de06f4955be60bb2504f1e0d9272 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -48,7 +48,7 @@ THREAD *mutt_sort_subthreads (THREAD *, int);
 
 WHERE short BrowserSort INITVAL (SORT_SUBJECT);
 WHERE short Sort INITVAL (SORT_DATE);
-WHERE short SortAux INITVAL (SORT_DATE); /* auxiallary sorting method */
+WHERE short SortAux INITVAL (SORT_DATE); /* auxiliary sorting method */
 WHERE short SortAlias INITVAL (SORT_ALIAS);
 
 /* FIXME: This one does not belong to here */

diff --git a/thread.c b/thread.c
index d69ac8838019625f31454d943c83e4c5541ddf7b..de1d16badc91e375d1faa0b83e620bdfb13229d3 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -1367,7 +1367,7 @@ static void clean_references (THREAD *brk, THREAD *cur)
 
     /* Looking for the first bad reference according to the new threading.
      * Optimal since Mutt stores the references in reverse order, and the
-     * first loop should match immediatly for mails respecting RFC2822. */
+     * first loop should match immediately for mails respecting RFC2822. */
     for (p = brk; !done && p; p = p->parent)
       for (ref = cur->message->env->references; p->message && ref; ref = ref->next)
        if (!mutt_strcasecmp (ref->data, p->message->env->message_id))