From: Edward Betts Date: Fri, 1 Jun 2018 09:46:34 +0000 (+0100) Subject: Correct spelling mistakes. X-Git-Tag: mutt-1-11-rel~155 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=479241fef94fb03e1e4edfbbc06de9cf236e001e;p=mutt Correct spelling mistakes. --- diff --git a/buffy.c b/buffy.c index 728f819d..5d11ad9e 100644 --- a/buffy.c +++ b/buffy.c @@ -307,7 +307,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, @@ -387,7 +387,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) @@ -412,7 +412,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/contrib/sample.muttrc b/contrib/sample.muttrc index 07dbe179..be264466 100644 --- a/contrib/sample.muttrc +++ b/contrib/sample.muttrc @@ -37,7 +37,7 @@ set edit_headers # let me edit the message header when composing #set fast_reply # skip initial prompts when replying #set fcc_attach # keep attachments in copies of sent messages? #set force_name # fcc by recipient, create if mailbox doesn't exist -#set forward_decode # weed and MIME decode forwaded messages +#set forward_decode # weed and MIME decode forwarded messages #set forward_format="[%a: %s]" # subject to use when forwarding messages #set forward_quote # quote the header and body of forward msgs #set index_format="%4C %Z %{%m/%d} [%2N] %-15.15F (%4c) %s" diff --git a/crypt-mod.h b/crypt-mod.h index 617f830d..2b8ba4b8 100644 --- 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 90cd0928..11a668b4 100644 --- a/crypt.c +++ b/crypt.c @@ -248,7 +248,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/doc/manual.xml.head b/doc/manual.xml.head index 4f413091..67fbcbc0 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head @@ -5266,7 +5266,7 @@ coloring. -Special attention has to be payed when using regular expressions inside +Special attention has to be paid when using regular expressions inside of patterns. Specifically, Mutt's parser for these patterns will strip one level of backslash (\), which is normally used for quoting. If it is your intention to use a backslash in the regular diff --git a/hcache.c b/hcache.c index 2b73b5b2..0aa05d6a 100644 --- a/hcache.c +++ b/hcache.c @@ -686,7 +686,7 @@ mutt_hcache_per_folder(const char *path, const char *folder, return hcpath; } -/* This function transforms a header into a char so that it is useable by +/* This function transforms a header into a char so that it is usable by * db_store. */ static void * diff --git a/init.c b/init.c index f8a54e6d..2e010674 100644 --- a/init.c +++ b/init.c @@ -3571,7 +3571,7 @@ void mutt_init (int skip_sys_rc, LIST *commands) AliasFile = safe_strdup (Muttrc); } - /* 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) { diff --git a/intl/dcigettext.c b/intl/dcigettext.c index 54d2156b..49078e4b 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -573,7 +573,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) /* When this is a SUID binary we must not allow accessing files outside the dedicated directories. */ if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale)) - /* Ingore this entry. */ + /* Ignore this entry. */ continue; } diff --git a/intl/libgettext.h b/intl/libgettext.h index af347445..de1bf348 100644 --- a/intl/libgettext.h +++ b/intl/libgettext.h @@ -42,7 +42,7 @@ #endif -/* For automatical extraction of messages sometimes no real +/* For automatic extraction of messages sometimes no real translation is needed. Instead the string itself is the result. */ #define gettext_noop(Str) (Str) diff --git a/mh.c b/mh.c index 2618fe12..4d616e0a 100644 --- a/mh.c +++ b/mh.c @@ -265,7 +265,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) @@ -1394,7 +1394,7 @@ static 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. diff --git a/mutt.h b/mutt.h index 663beb4f..c539f3a0 100644 --- a/mutt.h +++ b/mutt.h @@ -665,7 +665,7 @@ typedef struct parameter struct parameter *next; } 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 */ diff --git a/mutt_ssl.c b/mutt_ssl.c index 436f916d..32080cf0 100644 --- a/mutt_ssl.c +++ b/mutt_ssl.c @@ -296,7 +296,7 @@ int mutt_ssl_starttls (CONNECTION* conn) * Even though only OpenSSL 0.9.5 and later will complain about the * lack of entropy, we try to our best and fill the pool with older * versions also. (That's the reason for the ugly #ifdefs and macros, - * otherwise I could have simply #ifdef'd the whole ssl_init funcion) + * otherwise I could have simply #ifdef'd the whole ssl_init function) */ static int ssl_init (void) { diff --git a/pager.c b/pager.c index 69341d88..5419fa27 100644 --- 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; diff --git a/postpone.c b/postpone.c index 7c5ca5b8..082820af 100644 --- a/postpone.c +++ b/postpone.c @@ -298,7 +298,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/send.c b/send.c index 6f7f9e6f..1a286058 100644 --- a/send.c +++ b/send.c @@ -1575,7 +1575,7 @@ ci_send_message (int flags, /* send mode */ } } - /* opportunistic encrypt relys on SMIME or PGP already being selected */ + /* opportunistic encrypt relies on SMIME or PGP already being selected */ if (option (OPTCRYPTOPPORTUNISTICENCRYPT)) { /* If something has already enabled encryption, e.g. OPTCRYPTAUTOENCRYPT diff --git a/sendlib.c b/sendlib.c index ef428541..b1e9ea54 100644 --- a/sendlib.c +++ b/sendlib.c @@ -2806,7 +2806,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, * */ mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0); - /* (postponment) if this was a reply of some sort, contians the + /* (postponment) if this was a reply of some sort, 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 diff --git a/smime_keys.pl b/smime_keys.pl index 7c2c94b5..fdab3856 100755 --- a/smime_keys.pl +++ b/smime_keys.pl @@ -176,7 +176,7 @@ Usage: smime_keys [file(s) | keyID [file(s)]] label : keyID required. changes/removes/adds label. remove : keyID required. verify : 1=keyID and optionally 2=CRL - Verifies the certificate chain, and optionally wether + Verifies the certificate chain, and optionally whether this certificate is included in supplied CRL (PEM format). Note: to verify all certificates at the same time, replace keyID with "all" @@ -615,7 +615,7 @@ sub openssl_dump_cert ($) { my $format = openssl_format($filename); my @args = ("x509", "-in", $filename, "-inform", $format); my $output = join("", openssl_exec(@args)); - $? and die "openssl x509 certicate dump returned $?"; + $? and die "openssl x509 certificate dump returned $?"; return $output; } diff --git a/thread.c b/thread.c index 4c4c7b04..2fb56fd5 100644 --- 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. */