From: Richard Russon Date: Tue, 5 Feb 2019 17:55:56 +0000 (+0000) Subject: fix spelling X-Git-Tag: 2019-10-25~372^2~26 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3eed1a28105077ac47712a18656f33dc3e994ef;p=neomutt fix spelling --- diff --git a/ChangeLog.md b/ChangeLog.md index 6470d63f1..24e6b044b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -101,7 +101,7 @@ - Update Portuguese (BR) translation (100%) - Update Spanish translation (64%) - Update Turkish translation (75%) - - Merge simliar messages + - Merge similar messages * Docs - Clarify precedence of settings in config files - Fix subjectrx example in the manual @@ -545,7 +545,7 @@ * Docs - Remove feature muttrc files - Merge README.notmuch into manual - - Remove unneded scripts + - Remove unneeded scripts - Remove README.SECURITY - Remove BEWARE and devel-notes.txt - Update Makefiles diff --git a/autosetup/autosetup b/autosetup/autosetup index a4480fd3b..8038b27f4 100755 --- a/autosetup/autosetup +++ b/autosetup/autosetup @@ -1308,7 +1308,7 @@ set modsource(formatting.tcl) { # Module which provides common text formatting -# This is designed for documenation which looks like: +# This is designed for documentation which looks like: # code {...} # or # code { @@ -1699,7 +1699,7 @@ set modsource(install.tcl) { # Module which can install autosetup # autosetup(installed)=1 means that autosetup is not running from source -# autosetup(sysinstall)=1 means that autosetup is running from a sysinstall verion +# autosetup(sysinstall)=1 means that autosetup is running from a sysinstall version # shared=1 means that we are trying to do a sysinstall. This is only possible from the development source. proc autosetup_install {dir {shared 0}} { diff --git a/browser.c b/browser.c index 7b24858a2..c4d064466 100644 --- a/browser.c +++ b/browser.c @@ -647,7 +647,7 @@ static void add_folder(struct Menu *menu, struct BrowserState *state, } /** - * init_state - Initilise a browser state + * init_state - Initialise a browser state * @param state BrowserState to initialise * @param menu Current menu */ diff --git a/config/set.h b/config/set.h index 9e3464821..7ed22569b 100644 --- a/config/set.h +++ b/config/set.h @@ -187,7 +187,7 @@ struct ConfigSetType * struct ConfigSet - Container for lots of config items * * The config items are stored in a HashTable so that their names can be looked - * up efficiently. Each config item is repesented by a HashElem. Once + * up efficiently. Each config item is represented by a HashElem. Once * created, this HashElem is static and may be used for the lifetime of the * ConfigSet. */ diff --git a/conn/ssl.c b/conn/ssl.c index 2cd0034ef..9300a0e5a 100644 --- a/conn/ssl.c +++ b/conn/ssl.c @@ -568,7 +568,7 @@ static bool hostname_match(const char *hostname, const char *certname) * 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) + * simply ifdef'd the whole ssl_init function) */ static int ssl_init(void) { @@ -634,7 +634,7 @@ static void ssl_get_client_cert(struct SslSockData *ssldata, struct Connection * } /** - * ssl_socket_close_and_restore - Close an SSL Connection and restore Connnection callbacks - Implements Connection::conn_close() + * ssl_socket_close_and_restore - Close an SSL Connection and restore Connection callbacks - Implements Connection::conn_close() */ static int ssl_socket_close_and_restore(struct Connection *conn) { diff --git a/contrib/sample.neomuttrc b/contrib/sample.neomuttrc index a2579e92f..a7fa21d2f 100644 --- a/contrib/sample.neomuttrc +++ b/contrib/sample.neomuttrc @@ -35,7 +35,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/contrib/smime_keys b/contrib/smime_keys index cf986cefd..08e5cde71 100755 --- a/contrib/smime_keys +++ b/contrib/smime_keys @@ -614,7 +614,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/email/idna.c b/email/idna.c index 4ac9770a4..d4eb70933 100644 --- a/email/idna.c +++ b/email/idna.c @@ -49,7 +49,7 @@ /* These Config Variables are only used in mutt/idna.c */ #ifdef HAVE_LIBIDN -bool IdnDecode; ///< Config: (idn) Decode internation domain names +bool IdnDecode; ///< Config: (idn) Decode international domain names bool IdnEncode; ///< Config: (idn) Encode international domain names #endif diff --git a/email/rfc2047.c b/email/rfc2047.c index 8b4a6ae41..45cc4c976 100644 --- a/email/rfc2047.c +++ b/email/rfc2047.c @@ -186,7 +186,7 @@ static char *parse_encoded_word(char *str, enum ContentEncoding *enc, char **cha * @retval 0 Success, string converted * @retval >0 Error, number of bytes that could be converted * - * If the data could be conveted using encoder, then set *encoder and *wlen. + * If the data could be converted using encoder, then set *encoder and *wlen. * Otherwise return an upper bound on the maximum length of the data which * could be converted. * diff --git a/email/rfc2231.c b/email/rfc2231.c index 308c8c542..4bd19cfa9 100644 --- a/email/rfc2231.c +++ b/email/rfc2231.c @@ -139,7 +139,7 @@ static struct Rfc2231Parameter *new_parameter(void) /** * list_insert - Insert parameter into an ordered list * @param list List to insert into - * @param par Paramter to insert + * @param par Parameter to insert * * Primary sorting key: attribute * Secondary sorting key: index diff --git a/globals.h b/globals.h index df1791e27..01f9b42a0 100644 --- a/globals.h +++ b/globals.h @@ -67,7 +67,7 @@ WHERE struct ListHead MailToAllow INITVAL(STAILQ_HEAD_INITIALIZER(MailToAllow)); WHERE struct ListHead MimeLookupList INITVAL(STAILQ_HEAD_INITIALIZER(MimeLookupList)); ///< List of mime types that that shouldn't use the mailcap entry WHERE struct ListHead Muttrc INITVAL(STAILQ_HEAD_INITIALIZER(Muttrc)); ///< List of config files to read #ifdef USE_SIDEBAR -WHERE struct ListHead SidebarWhitelist INITVAL(STAILQ_HEAD_INITIALIZER(SidebarWhitelist)); ///< List of mailboxes to alway display in the sidebar +WHERE struct ListHead SidebarWhitelist INITVAL(STAILQ_HEAD_INITIALIZER(SidebarWhitelist)); ///< List of mailboxes to always display in the sidebar #endif WHERE struct ListHead TempAttachmentsList INITVAL(STAILQ_HEAD_INITIALIZER(TempAttachmentsList)); ///< List of temporary files for displaying attachments WHERE struct ListHead UserHeader INITVAL(STAILQ_HEAD_INITIALIZER(UserHeader)); ///< List of custom headers to add to outgoing emails diff --git a/handler.c b/handler.c index bc3c86383..4b5f2dbcf 100644 --- a/handler.c +++ b/handler.c @@ -427,7 +427,7 @@ static void decode_uuencoded(struct State *s, long len, bool istext, iconv_t cd) * Test if the `MM_NOASK` environment variable should allow autoviewing of the * attachment. * - * @note If `MM_NOASK=1` then the function will automaticaly return true. + * @note If `MM_NOASK=1` then the function will automatically return true. */ static bool is_mmnoask(const char *buf) { diff --git a/hcache/hcache.h b/hcache/hcache.h index bae0e443c..270550e76 100644 --- a/hcache/hcache.h +++ b/hcache/hcache.h @@ -113,7 +113,7 @@ void mutt_hcache_close(header_cache_t *hc); * @param hc Pointer to the header_cache_t structure got by mutt_hcache_open * @param key Message identification string * @param keylen Length of the string pointed to by key - * @retval ptr Succees, data if found and valid + * @retval ptr Success, data if found and valid * @retval NULL Otherwise * * @note This function performs a check on the validity of the data found by diff --git a/hcache/serialize.c b/hcache/serialize.c index 5676e230d..e3bef9bdc 100644 --- a/hcache/serialize.c +++ b/hcache/serialize.c @@ -579,7 +579,7 @@ void serial_restore_envelope(struct Envelope *env, const unsigned char *d, int * * @param uidvalidity IMAP server identifier * @retval ptr Binary blob representing the Header * - * This function transforms a e into a char so that it is useable by + * This function transforms a e into a char so that it is usable by * db_store. */ void *mutt_hcache_dump(header_cache_t *hc, const struct Email *e, int *off, unsigned int uidvalidity) diff --git a/hdrline.c b/hdrline.c index 437069d56..1131e2c11 100644 --- a/hdrline.c +++ b/hdrline.c @@ -119,7 +119,7 @@ bool mutt_is_subscribed_list(struct Address *addr) /** * check_for_mailing_list - Search list of addresses for a mailing list - * @param addr List of addreses to search + * @param addr List of addresses to search * @param pfx Prefix string * @param buf Buffer to store results * @param buflen Buffer length diff --git a/icommands.c b/icommands.c index b98cfb558..3f688942b 100644 --- a/icommands.c +++ b/icommands.c @@ -40,7 +40,7 @@ static enum CommandResult icmd_version(struct Buffer *, struct Buffer *, unsign /** * ICommandList - All available informational commands * - * @note These commands take precendence over conventional mutt rc-lines + * @note These commands take precedence over conventional mutt rc-lines */ const struct ICommand ICommandList[] = { { "set", icmd_set, 0 }, diff --git a/imap/imap.c b/imap/imap.c index 829433481..b752b9795 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -1707,7 +1707,7 @@ int imap_sync_mailbox(struct Mailbox *m, bool expunge, bool close) /* TODO: why the e->env check? */ if ((e->env && e->env->changed) || e->attach_del) { - /* L10N: The plural is choosen by the last %d, i.e. the total number */ + /* L10N: The plural is chosen by the last %d, i.e. the total number */ mutt_message(ngettext("Saving changed message... [%d/%d]", "Saving changed messages... [%d/%d]", m->msg_count), i + 1, m->msg_count); diff --git a/imap/imap_private.h b/imap/imap_private.h index b511fadcb..0b7f0a34d 100644 --- a/imap/imap_private.h +++ b/imap/imap_private.h @@ -171,7 +171,7 @@ struct ImapAccountData struct Connection *conn; struct ConnAccount conn_account; bool recovering; - bool closing; /* If true, we are wating for CLOSE completion */ + bool closing; /* If true, we are waiting for CLOSE completion */ unsigned char state; ///< ImapState, e.g. #IMAP_AUTHENTICATED unsigned char status; ///< ImapFlags, e.g. #IMAP_FATAL /* let me explain capstr: SASL needs the capability string (not bits). diff --git a/index.c b/index.c index a9bb093b5..b9e1a0907 100644 --- a/index.c +++ b/index.c @@ -296,7 +296,7 @@ static int ci_first_message(void) return old; /* If Sort is reverse and not threaded, the latest message is first. - * If Sort is threaded, the latest message is first iff exactly one + * If Sort is threaded, the latest message is first if exactly one * of Sort and SortAux are reverse. */ if (((Sort & SORT_REVERSE) && (Sort & SORT_MASK) != SORT_THREADS) || diff --git a/maildir/shared.c b/maildir/shared.c index 7cc7a0888..bb288a42a 100644 --- a/maildir/shared.c +++ b/maildir/shared.c @@ -1361,7 +1361,7 @@ void maildir_parse_flags(struct Email *e, const char *path) /** * maildir_parse_stream - Parse a Maildir message * @param magic Mailbox type, e.g. #MUTT_MAILDIR - * @param f Mesage file handle + * @param f Message file handle * @param fname Message filename * @param is_old true, if the email is old (read) * @param e Email diff --git a/menu.c b/menu.c index bd2ae89a0..3e5430e58 100644 --- a/menu.c +++ b/menu.c @@ -1241,7 +1241,7 @@ static int menu_dialog_translate_op(int i) * menu_dialog_dokey - Check if there are any menu key events to process * @param menu Current Menu * @param ip Event ID - * @retval 0 An event occured for the menu, or a timeout + * @retval 0 An event occurred for the menu, or a timeout * @retval -1 There was an event, but not for menu */ static int menu_dialog_dokey(struct Menu *menu, int *ip) diff --git a/mutt.h b/mutt.h index fcce7a5c4..826108899 100644 --- a/mutt.h +++ b/mutt.h @@ -124,7 +124,7 @@ enum MuttMisc MUTT_TAG, ///< Tagged messages MUTT_UNTAG, ///< Messages to be un-tagged MUTT_LIMIT, ///< Messages in limited view - MUTT_EXPIRED, ///< Expired messsages + MUTT_EXPIRED, ///< Expired messages MUTT_SUPERSEDED, ///< Superseded messages MUTT_TRASH, ///< Trashed messages diff --git a/mutt/charset.c b/mutt/charset.c index 11e3ddbb0..a25e3c960 100644 --- a/mutt/charset.c +++ b/mutt/charset.c @@ -947,7 +947,7 @@ char *mutt_ch_fgetconvs(char *buf, size_t buflen, struct FgetConv *fc) * mutt_ch_set_charset - Update the records for a new character set * @param charset New character set * - * Check if this chararacter set is utf-8 and pick a suitable replacement + * Check if this character set is utf-8 and pick a suitable replacement * character for unprintable characters. * * @note This calls `bind_textdomain_codeset()` which will affect future diff --git a/mutt/file.c b/mutt/file.c index 0199f5d5e..7e2060469 100644 --- a/mutt/file.c +++ b/mutt/file.c @@ -692,7 +692,7 @@ char *mutt_file_read_line(char *line, size_t *size, FILE *fp, int *line_num, int * @param iter State of iteration including ptr to line * @param fp File pointer to read from * @param flags Same as mutt_file_read_line() - * @retval true iff data read, false on eof + * @retval true if data read, false on eof * * This is a slightly cleaner interface for mutt_file_read_line() which avoids * the eternal C loop initialization ugliness. Use like this: @@ -720,7 +720,7 @@ bool mutt_file_iter_line(struct MuttFileIter *iter, FILE *fp, int flags) * @param user_data Arbitrary data passed to "func" * @param fp File pointer to read from * @param flags Same as mutt_file_read_line() - * @retval true iff all data mapped, false if "func" returns false + * @retval true if all data mapped, false if "func" returns false */ bool mutt_file_map_lines(mutt_file_map_t func, void *user_data, FILE *fp, int flags) { diff --git a/muttlib.c b/muttlib.c index 05b1e3c49..81d33317c 100644 --- a/muttlib.c +++ b/muttlib.c @@ -766,7 +766,7 @@ int mutt_check_overwrite(const char *attname, const char *path, char *fname, * @param buflen Length of buffer * @param addr Email address to use * - * If the user hasn't set `$save_address` the name will be trucated to the '@' + * If the user hasn't set `$save_address` the name will be truncated to the '@' * character. */ void mutt_save_path(char *buf, size_t buflen, struct Address *addr) diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index da4ac20df..d539ee004 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -240,7 +240,7 @@ static const char *parse_version_number(const char *s, int *number) } /* This function breaks up the complete string-representation of the - * version number S, which is of the following struture: ... The major, * minor and micro number components will be stored in *MAJOR, *MINOR * and *MICRO. If MINOR or MICRO is NULL the version number is diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c index f3423ad34..8ec8f0c73 100644 --- a/ncrypt/pgp.c +++ b/ncrypt/pgp.c @@ -334,7 +334,7 @@ static int pgp_check_pgp_decryption_okay_regex(FILE *fpin) * @retval 1 - no patterns were matched (if delegated to decryption_okay_regex) * @retval 0 - DECRYPTION_OKAY was seen, with no PLAINTEXT outside * @retval -1 - No decryption status codes were encountered - * @retval -2 - PLAINTEXT was encountered outside of DECRYPTION delimeters + * @retval -2 - PLAINTEXT was encountered outside of DECRYPTION delimiters * @retval -3 - DECRYPTION_FAILED was encountered * * Checks GnuPGP status fd output for various status codes indicating diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c index c3223a4bf..1901ef6b1 100644 --- a/ncrypt/pgpinvoke.c +++ b/ncrypt/pgpinvoke.c @@ -52,7 +52,7 @@ #endif /* These Config Variables are only used in ncrypt/pgpinvoke.c */ -char *PgpClearsignCommand; ///< Config: (pgp) External command to inline-sign a messsage +char *PgpClearsignCommand; ///< Config: (pgp) External command to inline-sign a message char *PgpDecodeCommand; ///< Config: (pgp) External command to decode a PGP attachment char *PgpDecryptCommand; ///< Config: (pgp) External command to decrypt a PGP message char *PgpEncryptOnlyCommand; ///< Config: (pgp) External command to encrypt, but not sign a message diff --git a/nntp/nntp.c b/nntp/nntp.c index 0f8597da1..b9e0e5d70 100644 --- a/nntp/nntp.c +++ b/nntp/nntp.c @@ -837,7 +837,7 @@ static int nntp_query(struct NntpMboxData *mdata, char *line, size_t linelen) * @param mdata NNTP Mailbox data * @param query Query to match * @param qlen Length of query - * @param msg Progess message (OPTIONAL) + * @param msg Progress message (OPTIONAL) * @param func Callback function * @param data Data for callback function * @retval 0 Success diff --git a/pattern.c b/pattern.c index 24c57a2a5..7eb6542e0 100644 --- a/pattern.c +++ b/pattern.c @@ -192,7 +192,7 @@ static char LastSearchExpn[LONG_STRING] = { 0 }; /**< expanded version of LastSe * @param pat Pattern to match * @param s String to parse * @param err Buffer for error messages - * @retval true If the pattern was read succesfully + * @retval true If the pattern was read successfully */ static bool eat_regex(struct Pattern *pat, struct Buffer *s, struct Buffer *err) { @@ -566,7 +566,7 @@ static void adjust_date_range(struct tm *min, struct tm *max) * @param pat Pattern to store the date in * @param s String to parse * @param err Buffer for error messages - * @retval true If the pattern was read succesfully + * @retval true If the pattern was read successfully */ static bool eat_date(struct Pattern *pat, struct Buffer *s, struct Buffer *err) { @@ -725,7 +725,7 @@ static bool eat_date(struct Pattern *pat, struct Buffer *s, struct Buffer *err) * @param pat Pattern to store the range in * @param s String to parse * @param err Buffer for error messages - * @retval true If the pattern was read succesfully + * @retval true If the pattern was read successfully */ static bool eat_range(struct Pattern *pat, struct Buffer *s, struct Buffer *err) { @@ -849,7 +849,7 @@ static bool is_context_available(struct Buffer *s, regmatch_t pmatch[], }; /* First decide if we're going to need the context at all. - * Relative patterns need it iff they contain a dot or a number. + * Relative patterns need it if they contain a dot or a number. * Absolute patterns only need it if they contain a dot. */ char *context_loc = strpbrk(s->dptr + pmatch[0].rm_so, context_req_chars[kind]); if (!context_loc || (context_loc >= &s->dptr[pmatch[0].rm_eo])) @@ -1014,7 +1014,7 @@ static int eat_range_by_regex(struct Pattern *pat, struct Buffer *s, int kind, * @param pat Pattern to store the range in * @param s String to parse * @param err Buffer for error messages - * @retval true If the pattern was read succesfully + * @retval true If the pattern was read successfully */ static bool eat_message_range(struct Pattern *pat, struct Buffer *s, struct Buffer *err) { diff --git a/sendlib.c b/sendlib.c index 94919b1fb..dfb36e929 100644 --- a/sendlib.c +++ b/sendlib.c @@ -3117,7 +3117,7 @@ int mutt_write_multiple_fcc(const char *path, struct Email *e, const char *msgid if (!*tok) continue; - /* Only call mutt_expand_path iff tok has some data */ + /* Only call mutt_expand_path if tok has some data */ mutt_debug(1, "Fcc: additional mailbox token = '%s'\n", tok); mutt_str_strfcpy(fcc_expanded, tok, sizeof(fcc_expanded)); mutt_expand_path(fcc_expanded, sizeof(fcc_expanded)); diff --git a/sort.c b/sort.c index 6bc54b163..bf5532dd8 100644 --- a/sort.c +++ b/sort.c @@ -53,7 +53,7 @@ bool ReverseAlias; ///< Config: Display the alias in the index, rather than the static sort_t *AuxSort = NULL; /** - * perform_auxsort - Compare two emails using the auxilliary sort method + * perform_auxsort - Compare two emails using the auxiliary sort method * @param retval Result of normal sort method * @param a First email * @param b Second email diff --git a/state.c b/state.c index 29c4c0f75..51d4fdf20 100644 --- a/state.c +++ b/state.c @@ -159,7 +159,7 @@ int state_printf(struct State *s, const char *fmt, ...) /** * state_prefix_put - Write a prefixed fixed-string to the State * @param buf String to write - * @param buflen Lenth of string + * @param buflen Length of string * @param s State to write to */ void state_prefix_put(const char *buf, size_t buflen, struct State *s) diff --git a/status.c b/status.c index 51db28617..f719a4940 100644 --- a/status.c +++ b/status.c @@ -47,7 +47,7 @@ struct MbTable *StatusChars; ///< Config: Indicator characters for the status ba /** * get_sort_str - Get the sort method as a string * @param buf Buffer for the sort string - * @param buflen Length of the bufer + * @param buflen Length of the buffer * @param method Sort method, e.g. #SORT_DATE * @retval ptr Buffer pointer */ diff --git a/system.c b/system.c index adada6261..825b1c56e 100644 --- a/system.c +++ b/system.c @@ -39,7 +39,7 @@ /** * mutt_system - Run an external command - * @param cmd Command and argments + * @param cmd Command and arguments * @retval -1 Error * @retval >=0 Success (command's return code) * diff --git a/test/acutest.h b/test/acutest.h index b852186ce..53a4519b8 100644 --- a/test/acutest.h +++ b/test/acutest.h @@ -897,9 +897,9 @@ test_cmdline_read__(const TEST_CMDLINE_OPTION__* options, int argc, char** argv, if(strncmp(badoptname, "--", 2) == 0) { /* Strip any argument from the long option. */ - char* assignement = strchr(badoptname, '='); - if(assignement != NULL) { - size_t len = assignement - badoptname; + char* assignment = strchr(badoptname, '='); + if(assignment != NULL) { + size_t len = assignment - badoptname; if(len > TEST_CMDLINE_AUXBUF_SIZE__) len = TEST_CMDLINE_AUXBUF_SIZE__; strncpy(auxbuf, badoptname, len);