fix typos and grammar in the comments

diff --git a/ascii.c b/ascii.c
index abc8f6c6cc268663a633958fb6becd72956ac022..16003bb492201e328fb5e13f2183328f588563b0 100644 (file)
--- a/ascii.c
+++ b/ascii.c
@@ -49,7 +49,7 @@ int ascii_strcasecmp (const char *a, const char *b)
   {
     if ((i = tolower (*a) - tolower (*b)))
       return i;
-    /* test for NUL here rather that in the for loop in order to detect unqual
+    /* test for NUL here rather that in the for loop in order to detect unequal
      * length strings (see http://dev.mutt.org/trac/ticket/3601)
      */
     if (!*a)

diff --git a/buffy.c b/buffy.c
index c33373988077b4c1fbd7d7fe0ce198123f36013e..5bcded465d546d817500aa7ce3602c336557d0d1 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -313,7 +313,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
 
 /* Checks the specified maildir subdir (cur or new) for new mail or mail counts.
  * check_new:   if true, check for new mail.
- * check_stats: if true, count total, new, and flagged mesages.
+ * check_stats: if true, count total, new, and flagged messages.
  * Returns 1 if the dir has new mail.
  */
 static int buffy_maildir_check_dir (BUFFY* mailbox, const char *dir_name, int check_new,
@@ -393,7 +393,7 @@ static int buffy_maildir_check_dir (BUFFY* mailbox, const char *dir_name, int ch
 }
 
 /* Checks new mail for a maildir mailbox.
- * check_stats: if true, also count total, new, and flagged mesages.
+ * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
 static int buffy_maildir_check (BUFFY* mailbox, int check_stats)
@@ -418,7 +418,7 @@ static int buffy_maildir_check (BUFFY* mailbox, int check_stats)
 }
 
 /* Checks new mail for an mbox mailbox
- * check_stats: if true, also count total, new, and flagged mesages.
+ * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
 static int buffy_mbox_check (BUFFY* mailbox, struct stat *sb, int check_stats)

diff --git a/charset.c b/charset.c
index 72b171560629dc47e145e9ccc369fd5247e24a4b..9f0ed03c7d40c5b0bb88cd872ef482df6fed4fef 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -375,7 +375,7 @@ iconv_t mutt_iconv_open (const char *tocode, const char *fromcode, int flags)
   mutt_canonical_charset (fromcode1, sizeof (fromcode1), fromcode);
 
   /* maybe apply charset-hooks and recanonicalise fromcode,
-   * but only when caller asked us to sanitize a potentialy wrong
+   * but only when caller asked us to sanitize a potentially wrong
    * charset name incoming from the wild exterior. */
   if ((flags & MUTT_ICONV_HOOK_FROM) && (tmp = mutt_charset_hook (fromcode1)))
     mutt_canonical_charset (fromcode1, sizeof (fromcode1), tmp);

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 8683c6e3a9169ae3fdbfc6352a7a2fa2ae4f61bb..9605233dcc011d1bf8b436d0e0f6aeed258ad528 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -316,7 +316,7 @@ static void crypt_free_key (crypt_key_t **keylist)
   }
 }
 
-/* Return trute when key K is valid. */
+/* Return true when key K is valid. */
 static int crypt_key_is_valid (crypt_key_t *k)
 {
   if (k->flags & KEYFLAG_CANTUSE)
@@ -324,7 +324,7 @@ static int crypt_key_is_valid (crypt_key_t *k)
   return 1;
 }
 
-/* Return true whe validity of KEY is sufficient. */
+/* Return true when validity of KEY is sufficient. */
 static int crypt_id_is_strong (crypt_key_t *key)
 {
   unsigned int is_strong = 0;
@@ -836,7 +836,7 @@ static char *encrypt_gpgme_object (gpgme_data_t plaintext, gpgme_key_t *rset,
    operation.  Return the algorithm name as a C string in buffer BUF
    which must have been allocated by the caller with size BUFLEN.
    Returns 0 on success or -1 in case of an error.  The return string
-   is truncted to BUFLEN - 1. */
+   is truncated to BUFLEN - 1. */
 static int get_micalg (gpgme_ctx_t ctx, int use_smime, char *buf, size_t buflen)
 {
   gpgme_sign_result_t result = NULL;
@@ -3782,8 +3782,8 @@ static crypt_key_t *get_candidates (LIST * hints, unsigned int app, int secret)
   
   if ((app & APPLICATION_PGP))
     {
-      /* Its all a mess.  That old GPGME expects different things
-         depending on the protocol.  For gpg we don' t need percent
+      /* It's all a mess.  That old GPGME expects different things
+         depending on the protocol.  For gpg we don't need percent
          escaped pappert but simple strings passed in an array to the
          keylist_ext_start function. */
       LIST *l;
@@ -3948,7 +3948,7 @@ static LIST *crypt_add_string_to_hints (LIST *hints, const char *str)
 }
 
 /* Display a menu to select a key from the array KEYS. FORCED_VALID
-   will be set to true on return if the user did override the the
+   will be set to true on return if the user did override the
    key's validity. */
 static crypt_key_t *crypt_select_key (crypt_key_t *keys,
                                       ADDRESS * p, const char *s, 

diff --git a/crypt-mod.c b/crypt-mod.c
index 0000356cdf162a47af55b85f828bf4e75fd92022..a899a9b01141f208346fa630ad8637ada7bf5d64 100644 (file)
--- a/crypt-mod.c
+++ b/crypt-mod.c
@@ -22,7 +22,7 @@
 
 #include "crypt-mod.h"
 
-/* A type an a variable to keep track of registered crypto modules. */
+/* A type of a variable to keep track of registered crypto modules. */
 typedef struct crypt_module *crypt_module_t;
 
 struct crypt_module

diff --git a/crypt-mod.h b/crypt-mod.h
index 70910eee279cef0a186a698590cb3f85c4e1f7f6..0a5cc2e4f3824215997e34696d819fc5daaee990 100644 (file)
--- a/crypt-mod.h
+++ b/crypt-mod.h
@@ -69,7 +69,7 @@ typedef void (*crypt_func_init_t) (void);
 typedef void (*crypt_func_set_sender_t) (const char *sender);
 
 /*
-   A structure to keep all crypto module fucntions together.
+   A structure to keep all crypto module functions together.
  */
 typedef struct crypt_module_functions
 {

diff --git a/crypt.c b/crypt.c
index 7b12f65380771d13cc3ae24fc16adb4f59baf4a1..a0085fa9314aa4c921aa0dce9e25445dba0f535b 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -250,7 +250,7 @@ int mutt_protect (HEADER *msg, char *keylist)
       /* free tmp_body if messages was signed AND encrypted ... */
       if (tmp_smime_pbody != msg->content && tmp_smime_pbody != tmp_pbody)
       {
-       /* detatch and don't delete msg->content,
+       /* detach and don't delete msg->content,
           which tmp_smime_pbody->parts after signing. */
        tmp_smime_pbody->parts = tmp_smime_pbody->parts->next;
        msg->content->next = NULL;

diff --git a/curs_lib.c b/curs_lib.c
index 679d1eefb79af3438599575dfecbf95905fb8e51..296124fd40b0058f8d6f0d8c1d8829ea0444c6be 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -1190,7 +1190,7 @@ void mutt_paddstr (int n, const char *s)
     addch (' ');
 }
 
-/* See how many bytes to copy from string so its at most maxlen bytes
+/* See how many bytes to copy from string so it's at most maxlen bytes
  * long and maxwid columns wide */
 size_t mutt_wstr_trunc (const char *src, size_t maxlen, size_t maxwid, size_t *width)
 {

diff --git a/dotlock.c b/dotlock.c
index a0cf5138a6967a39bf4771f646bd19aa1fb5523a..f1e6aeaebd3b8457ea0255ff1efe85cbe3272094 100644 (file)
--- a/dotlock.c
+++ b/dotlock.c
@@ -391,7 +391,7 @@ usage (const char *av0)
  *
  * Return values:
  * 
- * 0 - Evereything's fine.  The program's new current
+ * 0 - Everything's fine.  The program's new current
  *     directory is the contains the file to be locked.
  *     The string pointed to by bn contains the name of
  *     the file to be locked.

diff --git a/gnupgparse.c b/gnupgparse.c
index 424e4767aee37448dafcf0a4cc2fdcf4d1d1de11..d087e3ed63945b39756f267feb361b76797ec154 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -367,7 +367,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
   if (!(is_uid || is_fpr || (*is_subkey && option (OPTPGPIGNORESUB))))
     k = safe_malloc (sizeof (*k));
   memcpy (k, &tmp, sizeof (*k));
-  /* fixup parentship of uids after mering the temp key into
+  /* fixup parentship of uids after merging the temp key into
    * the real key */
   if (tmp.address)
   {

diff --git a/hcache.c b/hcache.c
index 67e02c2fb772b26c125aced0871d699cfef0998d..95d4fcc4ad66b7f6a04b72edbc9a034250a131e0 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -557,7 +557,7 @@ static int create_hcache_dir(const char *path)
 /**
  * mutt_hcache_per_folder - Generate the hcache pathname
  * @param path   Base directory, from $header_cache
- * @paran folder Mailbox name (including protocol)
+ * @param folder Mailbox name (including protocol)
  * @param namer  Callback to generate database filename
  *
  * @return Full pathname to the database (to be generated)

diff --git a/init.c b/init.c
index cf401d6e1ace72637c918073d66d7b69a88f37d1..78b306f66c27f6b3bd9adbceff93c41c12203627 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2434,7 +2434,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
       mutt_extract_token (tmp, s, 0);
 
       if (parse_regex(idx, tmp, err))
-       /* $reply_regexp and $alterantes require special treatment */
+       /* $reply_regexp and $alternates require special treatment */
        if (Context && Context->msgcount &&
            mutt_strcmp (MuttVars[idx].option, "reply_regexp") == 0)
        {
@@ -3313,7 +3313,7 @@ int mutt_nm_query_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]);
@@ -3363,7 +3363,7 @@ int mutt_nm_tag_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]);
@@ -3940,7 +3940,7 @@ void mutt_init (int skip_sys_rc, LIST *commands)
     AliasFile = safe_strdup (Muttrc->data);
   }
 
-  /* Process the global rc file if it exists and the user hasn't explicity
+  /* Process the global rc file if it exists and the user hasn't explicitly
      requested not to via "-n".  */
   if (!skip_sys_rc)
   {
@@ -4212,7 +4212,7 @@ int mutt_label_complete (char *buffer, size_t len, int numtabs)
     Matches[Num_matched++] = User_typed;
 
     /* All matches are stored. Longest non-ambiguous string is ""
-     * i.e. dont change 'buffer'. Fake successful return this time */
+     * i.e. don't change 'buffer'. Fake successful return this time */
     if (User_typed[0] == 0)
       return 1;
   }
@@ -4220,7 +4220,7 @@ int mutt_label_complete (char *buffer, size_t len, 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/lib.c b/lib.c
index 7247515a3e13a5584066a91c988f9b61c3b6fef1..8018704001e973bf6d892c8fdca44995c53d98ff 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -958,7 +958,7 @@ void mutt_remove_trailing_ws (char *s)
 }
 
 /*
- * Write the concatened pathname (dir + "/" + fname) into dst.
+ * Write the concatenated pathname (dir + "/" + fname) into dst.
  * The slash is omitted when dir or fname is of 0 length.
  * Returns NULL on error or a pointer to dst otherwise.
  */
@@ -1192,7 +1192,7 @@ char * strfcpy (char *dest, const char *src, size_t dlen)
  * Create a directory, creating the parents if necessary. (like mkdir -p)
  *
  * Note: The permissions are only set on the final directory.
- *       The permissions of any parent directoies are determined by the umask.
+ *       The permissions of any parent directories are determined by the umask.
  *       (This is how "mkdir -p" behaves)
  */
 int mutt_mkdir(const char *path, mode_t mode)

diff --git a/mh.c b/mh.c
index 2018d70c966fac700a6e0e7b0a9f36661632ad7b..2918d808a4b9a7f00cd7eef90584dcf2384f75c7 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -242,7 +242,7 @@ static inline mode_t mh_umask (CONTEXT* ctx)
 
 /*
  * Returns 1 if the .mh_sequences last modification time is more recent than the last visit to this mailbox
- * Returns 0 if the modifcation time is older
+ * Returns 0 if the modification time is older
  * Returns -1 on error
  */
 static int mh_sequences_changed(BUFFY *b)
@@ -273,7 +273,7 @@ static int mh_already_notified(BUFFY *b, int msgno)
 }
 
 /* Checks new mail for a mh mailbox.
- * check_stats: if true, also count total, new, and flagged mesages.
+ * check_stats: if true, also count total, new, and flagged messages.
  * Returns 1 if the mailbox has new mail.
  */
 int mh_buffy (BUFFY *mailbox, int check_stats)
@@ -1086,7 +1086,7 @@ static struct maildir* maildir_sort (struct maildir* list, size_t len,
   return maildir_merge_lists (left, right, cmp);
 }
 
-/* Sorts mailbox into it's natural order.
+/* Sorts mailbox into its natural order.
  * Currently only defined for MH where files are numbered.
  */
 static void mh_sort_natural (CONTEXT *ctx, struct maildir **md)
@@ -1435,7 +1435,7 @@ void maildir_flags (char *dest, size_t destlen, HEADER * hdr)
 
   /*
    * The maildir specification requires that all files in the cur
-   * subdirectory have the :unique string appeneded, regardless of whether
+   * subdirectory have the :unique string appended, regardless of whether
    * or not there are any flags.  If .old is set, we know that this message
    * will end up in the cur directory, so we include it in the following
    * test even though there is no associated flag.
@@ -2524,7 +2524,7 @@ int maildir_check_empty (const char *path)
   /* Strategy here is to look for any file not beginning with a period */
 
   do {
-    /* we do "cur" on the first iteration since its more likely that we'll
+    /* we do "cur" on the first iteration since it's more likely that we'll
      * find old messages without having to scan both subdirs
      */
     snprintf (realpath, sizeof (realpath), "%s/%s", path,

diff --git a/mutt.h b/mutt.h
index 0c6b3b70d73d07eb1c54f5567c3edc425036b0f2..1d1d3a9f36e8c9a2ba30bab93e179265d24b30d9 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -737,7 +737,7 @@ static inline PARAMETER *mutt_new_parameter()
     return safe_calloc (1, sizeof (PARAMETER));
 }
 
-/* Information that helps in determing the Content-* of an attachment */
+/* Information that helps in determining the Content-* of an attachment */
 typedef struct content
 {
   long hibin;              /* 8-bit characters */
@@ -796,7 +796,7 @@ typedef struct body
   unsigned int encoding : 3;    /* content-transfer-encoding */
   unsigned int disposition : 2; /* content-disposition */
   unsigned int use_disp : 1;    /* Content-Disposition uses filename= ? */
-  unsigned int unlink : 1;      /* flag to indicate the the file named by
+  unsigned int unlink : 1;      /* flag to indicate the file named by
                                 * "filename" should be unlink()ed before
                                 * free()ing this structure
                                 */

diff --git a/mutt_crypt.h b/mutt_crypt.h
index 131daccd92c8060dfee1bba7580f96d37b7c703a..f76c89dde172c62d64c3ceee0351a39ccee0c5bb 100644 (file)
--- a/mutt_crypt.h
+++ b/mutt_crypt.h
@@ -160,7 +160,7 @@ void crypt_forget_passphrase (void);
 /* Check that we have a usable passphrase, ask if not. */
 int crypt_valid_passphrase (int);
 
-/* Write the message body/part A described by state S to a the given
+/* Write the message body/part A described by state S to the given
    TEMPFILE.  */
 int crypt_write_signed(BODY *a, STATE *s, const char *tempf);
 

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index a204892bea4b6ac8dc3e41e329f76a9c644f8dfe..a7d60e7cc9cc1487326c3033093e9cb9c8d2991b 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -158,7 +158,7 @@ struct nm_ctxdata
 
   unsigned int noprogress     : 1;  /**< Don't show the progress bar */
   unsigned int longrun        : 1;  /**< A long-lived action is in progress */
-  unsigned int trans          : 1;  /**< Atomic transacion in progress */
+  unsigned int trans          : 1;  /**< Atomic transaction in progress */
   unsigned int progress_ready : 1;  /**< A progress bar has been initialised */
 };
 

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index aa61d9d04cb401cabe09a5fe88fc1de273729f95..d79fe9fad32c38174a28f25280c2dfd22a6d8456 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -330,7 +330,7 @@ static int tls_set_priority(tlssockdata *data)
 #else
 /* This array needs to be large enough to hold all the possible values support
  * by Mutt.  The initialized values are just placeholders--the array gets
- * overwrriten in tls_negotiate() depending on the $ssl_use_* options.
+ * overwritten in tls_negotiate() depending on the $ssl_use_* options.
  */
 static int protocol_priority[] = {GNUTLS_TLS1_2, GNUTLS_TLS1_1, GNUTLS_TLS1, GNUTLS_SSL3, 0};
 

diff --git a/nntp.c b/nntp.c
index c25c1b2b40282e25581f9bc420c218dedc0d0284..3bfb4eeecb7ee9b6660d3b30591080fd8f012557 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -555,7 +555,7 @@ static int nntp_auth (NNTP_SERVER *nserv)
          return 0;
        }
 
-       /* terminate SASL sessoin */
+       /* terminate SASL session */
        sasl_dispose (&saslconn);
        if (conn->fd < 0)
          break;
@@ -1135,7 +1135,7 @@ static int parse_overview_line (char *line, void *data)
       }
     }
 
-    /* not chached yet, store header */
+    /* not cached yet, store header */
     else
     {
       mutt_debug (2, "parse_overview_line: mutt_hcache_store %s\n", buf);

diff --git a/pager.c b/pager.c
index 02d8a6398a8d3594bb58bee0e4d9096658111f7b..2b12c3a659a8492663d2378b08a88033e4343fdc 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -179,7 +179,7 @@ static void
 resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, int special,
     ansi_attr *a)
 {
-  int def_color;               /* color without syntax hilight */
+  int def_color;               /* color without syntax highlight */
   int color;                   /* final color */
   static int last_color;       /* last color set */
   int search = 0, i, m;
@@ -1405,7 +1405,7 @@ display_line (FILE *f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
     }
   }
 
-  /* only do color hiliting if we are viewing a message */
+  /* only do color highlighting if we are viewing a message */
   if (flags & (MUTT_SHOWCOLOR | MUTT_TYPES))
   {
     if ((*lineInfo)[n].type == -1)
@@ -1852,7 +1852,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
        NORMAL_COLOR;
        index->pagelen = index_window->rows;;
 
-       /* some fudge to work out where abouts the indicator should go */
+       /* some fudge to work out whereabouts the indicator should go */
        if (index->current - indicator < 0)
          index->top = 0;
        else if (index->max - index->current < index->pagelen - indicator)

diff --git a/pgp.c b/pgp.c
index ebfd1779086a79e600505ce4ab715db316fd7045..915ab3084896ca71a186a07829778e878292413c 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -1724,13 +1724,13 @@ int pgp_send_menu (HEADER *msg, int *redraw)
   char *mime_inline;
   if (msg->security & INLINE)
   {
-    /* L10N: These next string MUST have the same highlighed letter
+    /* L10N: These next string MUST have the same highlighted letter
              One of them will appear in each of the three strings marked "(inline"), below. */
     mime_inline = _("PGP/M(i)ME");
   }
   else
   {
-    /* L10N: These previous string MUST have the same highlighed letter
+    /* L10N: These previous string MUST have the same highlighted letter
              One of them will appear in each of the three strings marked "(inline"), below. */
     mime_inline = _("(i)nline");
   }

diff --git a/pop_lib.c b/pop_lib.c
index a13e0e6186fa5f5a38956f8290d2b426f2485529..3469df733fe8a5daf8ae285fe2466a2081ee87be 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -548,7 +548,7 @@ static int check_uidl (char *line, void *data)
   return 0;
 }
 
-/* reconnect and verify idnexes if connection was lost */
+/* reconnect and verify indexes if connection was lost */
 int pop_reconnect (CONTEXT *ctx)
 {
   int ret;

diff --git a/postpone.c b/postpone.c
index b915178da8e3ee31463d2f914ec66ea1b3ebab62..ebbf4061d7c0a6808f4d3ad6cc147e286c453e63 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -308,7 +308,7 @@ int mutt_get_postponed (CONTEXT *ctx, HEADER *hdr, HEADER **cur, char *fcc, size
     {
       if (ctx)
       {
-       /* if a mailbox is currently open, look to see if the orignal message
+       /* if a mailbox is currently open, look to see if the original message
           the user attempted to reply to is in this mailbox */
        p = skip_email_wsp(tmp->data + 18);
        if (!ctx->id_hash)

diff --git a/rfc1524.c b/rfc1524.c
index 264a0de76ec5ff75293bc36573c08d1a9ce31401..8f2d6fa7064553004835b63bf31c38b2dcb56ff2 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -559,7 +559,7 @@ int rfc1524_expand_filename (char *nametemplate,
 }
 
 /* If rfc1524_expand_command() is used on a recv'd message, then
- * the filename doesn't exist yet, but if its used while sending a message,
+ * the filename doesn't exist yet, but if it's used while sending a message,
  * then we need to rename the existing file.
  *
  * This function returns 0 on successful move, 1 on old file doesn't exist,

diff --git a/rfc822.c b/rfc822.c
index 6114a1aa36e55e791cfce32dffb52c5566b06da9..ff577b81268bdd293070ac1687795a89d66db014 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -771,7 +771,7 @@ int rfc822_write_address (char *buf, size_t buflen, ADDRESS *addr, int display)
     pbuf += len;
     buflen -= len;
 
-    /* if there is another address, and its not a group mailbox name or
+    /* if there is another address, and it's not a group mailbox name or
        group terminator, add a comma to separate the addresses */
     if (addr->next && addr->next->mailbox && !addr->group)
     {

diff --git a/sendlib.c b/sendlib.c
index 5c66e789be789e1363b0f8e422feb7e10bf44345..942c8b8863acf40c48d9c9a853b7cea5b186c558 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2892,7 +2892,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid,
    * */
   mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
 
-  /* (postponment) if this was a reply of some sort, <msgid> contains the
+  /* (postponement) if this was a reply of some sort, <msgid> contains the
    * Message-ID: of message replied to.  Save it using a special X-Mutt-
    * header so it can be picked up if the message is recalled at a later
    * point in time.  This will allow the message to be marked as replied if
@@ -2901,7 +2901,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid,
   if (post && msgid)
     fprintf (msg->fp, "X-Mutt-References: %s\n", msgid);
 
-  /* (postponment) save the Fcc: using a special X-Mutt- header so that
+  /* (postponement) save the Fcc: using a special X-Mutt- header so that
    * it can be picked up when the message is recalled
    */
   if (post && fcc)
@@ -2911,11 +2911,11 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid,
     fprintf (msg->fp, "Status: RO\n");
 
   /* mutt_write_rfc822_header() only writes out a Date: header with
-   * mode == 0, i.e. _not_ postponment; so write out one ourself */
+   * mode == 0, i.e. _not_ postponement; so write out one ourself */
   if (post)
     fprintf (msg->fp, "%s", mutt_make_date (buf, sizeof (buf)));
 
-  /* (postponment) if the mail is to be signed or encrypted, save this info */
+  /* (postponement) if the mail is to be signed or encrypted, save this info */
   if ((WithCrypto & APPLICATION_PGP)
       && post && (hdr->security & APPLICATION_PGP))
   {
@@ -2935,7 +2935,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid,
     fputc ('\n', msg->fp);
   }
 
-  /* (postponment) if the mail is to be signed or encrypted, save this info */
+  /* (postponement) if the mail is to be signed or encrypted, save this info */
   if ((WithCrypto & APPLICATION_SMIME)
       && post && (hdr->security & APPLICATION_SMIME))
   {

diff --git a/thread.c b/thread.c
index b6da4d354eb4c2516e36e8db02bb7d04fb3a53a9..3d72c44c72e0b006deb2946f8f08458361770e59 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -408,7 +408,7 @@ static LIST *make_subject_list (THREAD *cur, time_t *dateptr)
   return (subjects);
 }
 
-/* find the best possible match for a parent mesage based upon subject.
+/* find the best possible match for a parent message based upon subject.
  * if there are multiple matches, the one which was sent the latest, but
  * before the current message, is used. 
  */