changeset: 6306:bc7e7cf0fed3
user:      Ondřej Bílka <nel...@seznam.cz>
date:      Tue Jul 23 14:07:04 2013 +0200
link:      http://dev.mutt.org/hg/mutt/rev/bc7e7cf0fed3

fix typos in comments

changeset: 6307:0beba37c336b
user:      Michael Elkins <m...@sigpipe.org>
date:      Fri Oct 04 16:47:59 2013 +0000
link:      http://dev.mutt.org/hg/mutt/rev/0beba37c336b

fix more comment typos

diffs (638 lines):

diff -r d3096e8796e7 -r 0beba37c336b compose.c
--- a/compose.c Tue Apr 16 20:12:25 2013 -0700
+++ b/compose.c Fri Oct 04 16:47:59 2013 +0000
@@ -1264,7 +1264,7 @@
 
     }
 
-    /* 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 -r d3096e8796e7 -r 0beba37c336b crypt-gpgme.c
--- a/crypt-gpgme.c     Tue Apr 16 20:12:25 2013 -0700
+++ b/crypt-gpgme.c     Fri Oct 04 16:47:59 2013 +0000
@@ -587,7 +587,7 @@
          {
            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 @@
   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,9 +1288,9 @@
   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
-   enumerator IDX which should start at 0 and incremete for each
+/* 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 increment for each
    call/signature. 
 
    Return values are: 0 for normal procession, 1 for a bad signature,
@@ -1783,10 +1783,10 @@
          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
+         encrypted part can then point into this file and there won't
+         ever be a need to decrypt again.  This needs a partial
          rewrite of the MIME engine. */
       BODY *bb = *cur;
       BODY *tmp_b;
@@ -2785,7 +2785,7 @@
   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 -r d3096e8796e7 -r 0beba37c336b crypt-mod.h
--- a/crypt-mod.h       Tue Apr 16 20:12:25 2013 -0700
+++ b/crypt-mod.h       Fri Oct 04 16:47:59 2013 +0000
@@ -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 @@
 
 
 /*
-   A structure to decribe a crypto module. 
+   A structure to describe a crypto module. 
  */
 typedef struct crypt_module_specs
 {
diff -r d3096e8796e7 -r 0beba37c336b curs_lib.c
--- a/curs_lib.c        Tue Apr 16 20:12:25 2013 -0700
+++ b/curs_lib.c        Fri Oct 04 16:47:59 2013 +0000
@@ -67,7 +67,7 @@
 }
 
 /* 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 -r d3096e8796e7 -r 0beba37c336b date.c
--- a/date.c    Tue Apr 16 20:12:25 2013 -0700
+++ b/date.c    Fri Oct 04 16:47:59 2013 +0000
@@ -77,7 +77,7 @@
   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 -r d3096e8796e7 -r 0beba37c336b doc/makedoc.c
--- a/doc/makedoc.c     Tue Apr 16 20:12:25 2013 -0700
+++ b/doc/makedoc.c     Fri Oct 04 16:47:59 2013 +0000
@@ -750,7 +750,7 @@
  ** - .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 -r d3096e8796e7 -r 0beba37c336b editmsg.c
--- a/editmsg.c Tue Apr 16 20:12:25 2013 -0700
+++ b/editmsg.c Fri Oct 04 16:47:59 2013 +0000
@@ -163,7 +163,7 @@
 
   /* 
    * XXX - we have to play games with the message flags to avoid
-   * problematic behaviour with maildir folders.
+   * problematic behavior with maildir folders.
    *
    */
 
diff -r d3096e8796e7 -r 0beba37c336b handler.c
--- a/handler.c Tue Apr 16 20:12:25 2013 -0700
+++ b/handler.c Fri Oct 04 16:47:59 2013 +0000
@@ -970,7 +970,7 @@
     }
     else
     {
-      /* determine if this type is on ther user's auto_view list */
+      /* determine if this type is on the user's auto_view list */
       LIST *t = AutoViewList;
 
       for (; t; t = t->next) {
@@ -1019,7 +1019,7 @@
 
   a = b;
 
-  /* First, search list of prefered types */
+  /* First, search list of preferred types */
   t = AlternativeOrderList;
   while (t && !choice)
   {
diff -r d3096e8796e7 -r 0beba37c336b imap/util.c
--- a/imap/util.c       Tue Apr 16 20:12:25 2013 -0700
+++ b/imap/util.c       Fri Oct 04 16:47:59 2013 +0000
@@ -161,7 +161,7 @@
 #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 -r d3096e8796e7 -r 0beba37c336b init.c
--- a/init.c    Tue Apr 16 20:12:25 2013 -0700
+++ b/init.c    Fri Oct 04 16:47:59 2013 +0000
@@ -259,7 +259,7 @@
       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 consisting 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 @@
     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 @@
     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 @@
     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 -r d3096e8796e7 -r 0beba37c336b intl/gettextP.h
--- a/intl/gettextP.h   Tue Apr 16 20:12:25 2013 -0700
+++ b/intl/gettextP.h   Fri Oct 04 16:47:59 2013 +0000
@@ -94,8 +94,8 @@
     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 -r d3096e8796e7 -r 0beba37c336b intl/plural.c
--- a/intl/plural.c     Tue Apr 16 20:12:25 2013 -0700
+++ b/intl/plural.c     Fri Oct 04 16:47:59 2013 +0000
@@ -345,7 +345,7 @@
 #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 @@
 #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 -r d3096e8796e7 -r 0beba37c336b keymap.c
--- a/keymap.c  Tue Apr 16 20:12:25 2013 -0700
+++ b/keymap.c  Fri Oct 04 16:47:59 2013 +0000
@@ -408,7 +408,7 @@
 /* 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 -r d3096e8796e7 -r 0beba37c336b lib.c
--- a/lib.c     Tue Apr 16 20:12:25 2013 -0700
+++ b/lib.c     Fri Oct 04 16:47:59 2013 +0000
@@ -787,7 +787,7 @@
       }
       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 -r d3096e8796e7 -r 0beba37c336b mbox.c
--- a/mbox.c    Tue Apr 16 20:12:25 2013 -0700
+++ b/mbox.c    Fri Oct 04 16:47:59 2013 +0000
@@ -978,7 +978,7 @@
 
   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 -r d3096e8796e7 -r 0beba37c336b mkdtemp.c
--- a/mkdtemp.c Tue Apr 16 20:12:25 2013 -0700
+++ b/mkdtemp.c Fri Oct 04 16:47:59 2013 +0000
@@ -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 -r d3096e8796e7 -r 0beba37c336b mutt.h
--- a/mutt.h    Tue Apr 16 20:12:25 2013 -0700
+++ b/mutt.h    Fri Oct 04 16:47:59 2013 +0000
@@ -481,7 +481,7 @@
 
   /* 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 @@
   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 -r d3096e8796e7 -r 0beba37c336b mutt_menu.h
--- a/mutt_menu.h       Tue Apr 16 20:12:25 2013 -0700
+++ b/mutt_menu.h       Fri Oct 04 16:47:59 2013 +0000
@@ -50,7 +50,7 @@
   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 -r d3096e8796e7 -r 0beba37c336b mutt_ssl.c
--- a/mutt_ssl.c        Tue Apr 16 20:12:25 2013 -0700
+++ b/mutt_ssl.c        Fri Oct 04 16:47:59 2013 +0000
@@ -377,7 +377,7 @@
   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 -r d3096e8796e7 -r 0beba37c336b mutt_ssl_gnutls.c
--- a/mutt_ssl_gnutls.c Tue Apr 16 20:12:25 2013 -0700
+++ b/mutt_ssl_gnutls.c Fri Oct 04 16:47:59 2013 +0000
@@ -244,7 +244,7 @@
  */
 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 -r d3096e8796e7 -r 0beba37c336b muttlib.c
--- a/muttlib.c Tue Apr 16 20:12:25 2013 -0700
+++ b/muttlib.c Fri Oct 04 16:47:59 2013 +0000
@@ -1744,7 +1744,7 @@
    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 -r d3096e8796e7 -r 0beba37c336b mx.c
--- a/mx.c      Tue Apr 16 20:12:25 2013 -0700
+++ b/mx.c      Fri Oct 04 16:47:59 2013 +0000
@@ -1213,7 +1213,7 @@
 #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 -r d3096e8796e7 -r 0beba37c336b parse.c
--- a/parse.c   Tue Apr 16 20:12:25 2013 -0700
+++ b/parse.c   Fri Oct 04 16:47:59 2013 +0000
@@ -179,7 +179,7 @@
        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 @@
        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 -r d3096e8796e7 -r 0beba37c336b pattern.c
--- a/pattern.c Tue Apr 16 20:12:25 2013 -0700
+++ b/pattern.c Fri Oct 04 16:47:59 2013 +0000
@@ -646,7 +646,7 @@
     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 @@
     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 -r d3096e8796e7 -r 0beba37c336b pop.c
--- a/pop.c     Tue Apr 16 20:12:25 2013 -0700
+++ b/pop.c     Fri Oct 04 16:47:59 2013 +0000
@@ -56,7 +56,7 @@
  * 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 @@
  * Read headers
  * returns:
  *  0 on success
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid command or execution error,
  * -3 - error writing to tempfile
  */
diff -r d3096e8796e7 -r 0beba37c336b pop_auth.c
--- a/pop_auth.c        Tue Apr 16 20:12:25 2013 -0700
+++ b/pop_auth.c        Fri Oct 04 16:47:59 2013 +0000
@@ -142,7 +142,7 @@
 bail:
   sasl_dispose (&saslconn);
 
-  /* terminate SASL sessoin if the last responce is not +OK nor -ERR */
+  /* terminate SASL session if the last response is not +OK nor -ERR */
   if (!mutt_strncmp (inbuf, "+ ", 2))
   {
     snprintf (buf, sizeof (buf), "*\r\n");
@@ -289,7 +289,7 @@
 /*
  * Authentication
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - login failed,
  * -3 - authentication canceled.
 */
diff -r d3096e8796e7 -r 0beba37c336b pop_lib.c
--- a/pop_lib.c Tue Apr 16 20:12:25 2013 -0700
+++ b/pop_lib.c Fri Oct 04 16:47:59 2013 +0000
@@ -145,7 +145,7 @@
 /*
  * 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 @@
 /*
  * Open connection
  *  0 - successful,
- * -1 - conection lost,
+ * -1 - connection lost,
  * -2 - invalid response.
 */
 int pop_connect (POP_DATA *pop_data)
@@ -256,7 +256,7 @@
 /*
  * 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 @@
 /*
  * 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 @@
     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 @@
  * 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 -r d3096e8796e7 -r 0beba37c336b recvcmd.c
--- a/recvcmd.c Tue Apr 16 20:12:25 2013 -0700
+++ b/recvcmd.c Fri Oct 04 16:47:59 2013 +0000
@@ -565,7 +565,7 @@
 /* 
  * 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 -r d3096e8796e7 -r 0beba37c336b regex.c
--- a/regex.c   Tue Apr 16 20:12:25 2013 -0700
+++ b/regex.c   Fri Oct 04 16:47:59 2013 +0000
@@ -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 @@
 
 #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 -r d3096e8796e7 -r 0beba37c336b send.c
--- a/send.c    Tue Apr 16 20:12:25 2013 -0700
+++ b/send.c    Fri Oct 04 16:47:59 2013 +0000
@@ -481,7 +481,7 @@
       /* 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 @@
     /* 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 -r d3096e8796e7 -r 0beba37c336b signal.c
--- a/signal.c  Tue Apr 16 20:12:25 2013 -0700
+++ b/signal.c  Fri Oct 04 16:47:59 2013 +0000
@@ -128,7 +128,7 @@
 
   /* 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 -r d3096e8796e7 -r 0beba37c336b smime.c
--- a/smime.c   Tue Apr 16 20:12:25 2013 -0700
+++ b/smime.c   Fri Oct 04 16:47:59 2013 +0000
@@ -635,7 +635,7 @@
 
 /* 
    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 -r d3096e8796e7 -r 0beba37c336b snprintf.c
--- a/snprintf.c        Tue Apr 16 20:12:25 2013 -0700
+++ b/snprintf.c        Fri Oct 04 16:47:59 2013 +0000
@@ -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 <hol...@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 -r d3096e8796e7 -r 0beba37c336b sort.h
--- a/sort.h    Tue Apr 16 20:12:25 2013 -0700
+++ b/sort.h    Fri Oct 04 16:47:59 2013 +0000
@@ -48,7 +48,7 @@
 
 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 -r d3096e8796e7 -r 0beba37c336b thread.c
--- a/thread.c  Tue Apr 16 20:12:25 2013 -0700
+++ b/thread.c  Fri Oct 04 16:47:59 2013 +0000
@@ -1367,7 +1367,7 @@
 
     /* 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))

Reply via email to