diff --git a/ChangeLog.md b/ChangeLog.md index 77a8073fb15..857f3e169a7 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -689,7 +689,7 @@ - 22 resource leaks * Translations - Update translations - - Update the german translation (#397) + - Update the German translation (#397) * Docs - fix typo in notmuch example - remove duplicate "default" in the sidebar intro diff --git a/autosetup/autosetup b/autosetup/autosetup index ef742d072ae..dece81b880a 100755 --- a/autosetup/autosetup +++ b/autosetup/autosetup @@ -464,7 +464,7 @@ proc options-add {opts {header ""}} { set defaultvalue [dict get $autosetup(options-defaults) $name] dict set autosetup(optdefault) $name $defaultvalue } elseif {![info exists defaultvalue]} { - # For backward compatiblity, if ":name" was given, use name as both + # For backward compatibility, if ":name" was given, use name as both # the display text and the default value, but only if the user # specified the option without the value set defaultvalue $value diff --git a/conn/conn.h b/conn/conn.h index 1fb506227c0..a4f822b31e7 100644 --- a/conn/conn.h +++ b/conn/conn.h @@ -25,14 +25,16 @@ * * Manage external connections. * - * -# @subpage conn_globals - * -# @subpage conn_getdomain - * -# @subpage conn_sasl - * -# @subpage conn_sasl_plain - * -# @subpage conn_socket - * -# @subpage conn_ssl - * -# @subpage conn_ssl_gnutls - * -# @subpage conn_tunnel + * | File | Description | + * | :------------------ | :----------------------- | + * | conn/conn_globals.c | @subpage conn_globals | + * | conn/getdomain.c | @subpage conn_getdomain | + * | conn/sasl.c | @subpage conn_sasl | + * | conn/sasl_plain.c | @subpage conn_sasl_plain | + * | conn/socket.c | @subpage conn_socket | + * | conn/ssl.c | @subpage conn_ssl | + * | conn/ssl_gnutls.c | @subpage conn_ssl_gnutls | + * | conn/tunnel.c | @subpage conn_tunnel | */ #ifndef _CONN_CONN_H diff --git a/contrib/language50.txt b/contrib/language50.txt index 50376bfc259..3fa4fdfcd6c 100644 --- a/contrib/language50.txt +++ b/contrib/language50.txt @@ -136,7 +136,7 @@ us=Cannot combine -c and -r arguments\n #Untested [PGPK_IS_SEPERATE] -us=pgpk is a seperate program, not a symlink to pgp!\n +us=pgpk is a separate program, not a symlink to pgp!\n #Untested [UNKNOWN_SYMLINK] @@ -376,7 +376,7 @@ us="I/O error during call to ftell(): %s" #Untested [PGPERR_PRECEDING_ASSOCIATED_WITH] -us="The preceeding error was associated with: " +us="The preceding error was associated with: " #Untested [NOT_PGP_KEYFILE] @@ -882,7 +882,7 @@ us=You cannot disable an axiomatic key. Use pgpk -e to change your\n\ trust of this key, first.\n [RETRIEVING_URL] -us="Retreiving %s:/%s:%i%s\n" +us="Retrieving %s:/%s:%i%s\n" [ADD_THESE_KEYS] us="\nAdd these keys to your keyring? [Y/n] " diff --git a/contrib/smime_keys b/contrib/smime_keys index b3084390f03..99854798de2 100755 --- a/contrib/smime_keys +++ b/contrib/smime_keys @@ -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" diff --git a/curs_main.c b/curs_main.c index 1821703cdfa..64aca02df0b 100644 --- a/curs_main.c +++ b/curs_main.c @@ -2418,7 +2418,7 @@ int mutt_index_menu(void) case OP_DECRYPT_SAVE: if (!WithCrypto) break; - /* fall thru */ + /* fallthrough */ case OP_COPY_MESSAGE: case OP_SAVE: case OP_DECODE_COPY: diff --git a/doc/manual.xml.head b/doc/manual.xml.head index 1c2f059c74d..801349ca221 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head @@ -4666,7 +4666,9 @@ unignore posted-to: NeoMutt provides a number of advanced features for handling (possibly many) folders and new mail within them, please refer to for details (including in what situations and - how often NeoMutt checks for new mail). + how often NeoMutt checks for new mail). Additionally, + $new_mail_command can be used + to run a command when new mail is detected. The unmailboxes command is used to remove a token from the list of folders which receive mail. Use diff --git a/doxygen/layout.xml b/doxygen/layout.xml index 8709565a9b1..6c5ac69483b 100644 --- a/doxygen/layout.xml +++ b/doxygen/layout.xml @@ -15,7 +15,7 @@ - + diff --git a/hcache/backend.h b/hcache/backend.h index 68985aa1363..169510bb920 100644 --- a/hcache/backend.h +++ b/hcache/backend.h @@ -36,7 +36,7 @@ * * The hcache_open function has the purpose of opening a backend-specific * connection to the database file specified by the path parameter. Backends - * MUST return non-NULL specific context informations on success. This will be + * MUST return non-NULL specific context information on success. This will be * stored in the ctx member of the header_cache_t structure and passed on to * all other backend-specific functions (see below). */ diff --git a/hcache/hcache.h b/hcache/hcache.h index e2de88bd5ad..7b00ac228f4 100644 --- a/hcache/hcache.h +++ b/hcache/hcache.h @@ -29,36 +29,18 @@ * This module defines the user-visible header cache API, which is used within * neomutt to cache and restore mail header data. * - * @note This library isn't completely independent. - * Dependencies: - * - \ref mutt - * - Global variables - * * Charset - * * Charset_is_utf8 - * * HeaderCacheBackend - * * HeaderCachePageSize - * * Options - * * SpamList - * * NoSpamList - * - Neomutt functions - * * mutt_ch_convert_string() - * * mutt_encode_path() - * * mutt_new_body() - * * mutt_env_new() - * * mutt_sleep() - * * mx_lock_file() - * * mx_unlock_file() - * * @subpage hc_hcache * * Backends: * - * -# @subpage hc_bdb - * -# @subpage hc_gdbm - * -# @subpage hc_kc - * -# @subpage hc_lmdb - * -# @subpage hc_qdbm - * -# @subpage hc_tc + * | File | Description | + * | :------------ | :--------------- | + * | hcache/bdb.c | @subpage hc_bdb | + * | hcache/gdbm.c | @subpage hc_gdbm | + * | hcache/kc.c | @subpage hc_kc | + * | hcache/lmdb.c | @subpage hc_lmdb | + * | hcache/qdbm.c | @subpage hc_qdbm | + * | hcache/tc.c | @subpage hc_tc | */ #ifndef _MUTT_HCACHE_H diff --git a/imap/auth_cram.c b/imap/auth_cram.c index ddf3d343344..d38f5b8479f 100644 --- a/imap/auth_cram.c +++ b/imap/auth_cram.c @@ -21,7 +21,7 @@ */ /** - * @page imap_auth_crap IMAP CRAM-MD5 authentication method + * @page imap_auth_cram IMAP CRAM-MD5 authentication method * * IMAP CRAM-MD5 authentication method * diff --git a/imap/imap.h b/imap/imap.h index f366e72eb50..8640e30cf9f 100644 --- a/imap/imap.h +++ b/imap/imap.h @@ -26,19 +26,21 @@ * * IMAP network mailbox * - * -# @subpage imap_imap - * -# @subpage imap_auth_anon - * -# @subpage imap_auth - * -# @subpage imap_auth_crap - * -# @subpage imap_auth_gss - * -# @subpage imap_auth_login - * -# @subpage imap_auth_plain - * -# @subpage imap_auth_sasl - * -# @subpage imap_browse - * -# @subpage imap_command - * -# @subpage imap_message - * -# @subpage imap_utf7 - * -# @subpage imap_util + * | File | Description | + * | :---------------- | :----------------------- | + * | imap/imap.c | @subpage imap_imap | + * | imap/auth_anon.c | @subpage imap_auth_anon | + * | imap/auth.c | @subpage imap_auth | + * | imap/auth_cram.c | @subpage imap_auth_cram | + * | imap/auth_gss.c | @subpage imap_auth_gss | + * | imap/auth_login.c | @subpage imap_auth_login | + * | imap/auth_plain.c | @subpage imap_auth_plain | + * | imap/auth_sasl.c | @subpage imap_auth_sasl | + * | imap/browse.c | @subpage imap_browse | + * | imap/command.c | @subpage imap_command | + * | imap/message.c | @subpage imap_message | + * | imap/utf7.c | @subpage imap_utf7 | + * | imap/util.c | @subpage imap_util | */ #ifndef _IMAP_IMAP_H diff --git a/init.c b/init.c index 5342fa579a4..b1911746d6d 100644 --- a/init.c +++ b/init.c @@ -2454,7 +2454,7 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, restore_default(&MuttVars[idx]); } } - else if (!myvar && (idx >= 0) && DTYPE(MuttVars[idx].type) == DT_BOOL) + else if (!myvar && (idx >= 0) && (DTYPE(MuttVars[idx].type) == DT_BOOL)) { if (*s->dptr == '=') { @@ -2579,7 +2579,7 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, FREE(&myvar); myvar = "don't resort"; } - else if ((idx >= 0) && DTYPE(MuttVars[idx].type) == DT_PATH) + else if ((idx >= 0) && (DTYPE(MuttVars[idx].type) == DT_PATH)) { if (mutt_str_strcmp(MuttVars[idx].name, "debug_file") == 0 && debugfile_cmdline) { @@ -2597,7 +2597,7 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, if (mutt_str_strcmp(MuttVars[idx].name, "debug_file") == 0) restart_debug(); } - else if ((idx >= 0) && DTYPE(MuttVars[idx].type) == DT_STRING) + else if ((idx >= 0) && (DTYPE(MuttVars[idx].type) == DT_STRING)) { if ((strstr(MuttVars[idx].name, "charset") && check_charset(&MuttVars[idx], tmp->data) < 0) | @@ -2638,7 +2638,7 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, } } } - else if (DTYPE(MuttVars[idx].type) == DT_REGEX) + else if ((idx >= 0) && (DTYPE(MuttVars[idx].type) == DT_REGEX)) { if (query || *s->dptr != '=') { @@ -3313,7 +3313,7 @@ int mutt_command_complete(char *buffer, size_t len, int pos, int numtabs) snprintf(Completed, sizeof(Completed), "%s", Matches[0]); else if (numtabs > 1 && NumMatched > 2) { - /* cycle thru all the matches */ + /* cycle through all the matches */ snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]); } @@ -3370,7 +3370,7 @@ int mutt_command_complete(char *buffer, size_t len, int pos, int numtabs) snprintf(Completed, sizeof(Completed), "%s", Matches[0]); else if (numtabs > 1 && NumMatched > 2) { - /* cycle thru all the matches */ + /* cycle through all the matches */ snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]); } @@ -3418,7 +3418,7 @@ int mutt_command_complete(char *buffer, size_t len, int pos, int numtabs) snprintf(Completed, sizeof(Completed), "%s", Matches[0]); else if (numtabs > 1 && NumMatched > 2) { - /* cycle thru all the matches */ + /* cycle through all the matches */ snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]); } @@ -3574,7 +3574,7 @@ bool mutt_nm_query_complete(char *buffer, size_t len, int pos, int numtabs) snprintf(Completed, sizeof(Completed), "%s", Matches[0]); else if (numtabs > 1 && NumMatched > 2) { - /* cycle thru all the matches */ + /* cycle through all the matches */ snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]); } @@ -3629,7 +3629,7 @@ bool mutt_nm_tag_complete(char *buffer, size_t len, int numtabs) snprintf(Completed, sizeof(Completed), "%s", Matches[0]); else if (numtabs > 1 && NumMatched > 2) { - /* cycle thru all the matches */ + /* cycle through all the matches */ snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]); } @@ -4526,7 +4526,7 @@ int mutt_label_complete(char *buffer, size_t len, int numtabs) snprintf(Completed, sizeof(Completed), "%s", Matches[0]); else if (numtabs > 1 && NumMatched > 2) { - /* cycle thru all the matches */ + /* cycle through all the matches */ snprintf(Completed, sizeof(Completed), "%s", Matches[(numtabs - 2) % NumMatched]); } diff --git a/mutt/charset.c b/mutt/charset.c index eeef3b41d3f..9088fcc6a6c 100644 --- a/mutt/charset.c +++ b/mutt/charset.c @@ -287,7 +287,7 @@ static const char *lookup_charset(enum LookupType type, const char *cs) /** * mutt_ch_convert_nonmime_string - Try to convert a string using a list of character sets - * @param ps[in,out] String to be converted + * @param[in,out] ps String to be converted * @retval 0 Success * @retval -1 Error * @@ -939,7 +939,7 @@ void mutt_ch_set_charset(char *charset) if (mutt_ch_is_utf8(buffer)) { Charset_is_utf8 = true; - ReplacementChar = 0xfffd; + ReplacementChar = 0xfffd; /* replacement character */ } else { diff --git a/mutt/mutt.h b/mutt/mutt.h index 6ff65b84aba..5d4e5a7e88f 100644 --- a/mutt/mutt.h +++ b/mutt/mutt.h @@ -25,29 +25,32 @@ * * Each source file in the library provides a group of related functions. * + * | File | Description | + * | :------------- | :--------------- | + * | mutt/base64.c | @subpage base64 | + * | mutt/buffer.c | @subpage buffer | + * | mutt/charset.c | @subpage charset | + * | mutt/date.c | @subpage date | + * | mutt/debug.c | @subpage debug | + * | mutt/exit.c | @subpage exit | + * | mutt/file.c | @subpage file | + * | mutt/hash.c | @subpage hash | + * | mutt/idna.c | @subpage idna | + * | mutt/list.c | @subpage list | + * | mutt/mapping.c | @subpage mapping | + * | mutt/mbyte.c | @subpage mbyte | + * | mutt/md5.c | @subpage md5 | + * | mutt/memory.c | @subpage memory | + * | mutt/message.c | @subpage message | + * | mutt/mime.c | @subpage mime | + * | mutt/regex.c | @subpage regex | + * | mutt/rfc2047.c | @subpage rfc2047 | + * | mutt/sha1.c | @subpage sha1 | + * | mutt/signal.c | @subpage signal | + * | mutt/string.c | @subpage string | + * * @note The library is self-contained -- some files may depend on others in * the library, but none depends on source from outside. - * - * -# @subpage base64 - * -# @subpage buffer - * -# @subpage charset - * -# @subpage date - * -# @subpage debug - * -# @subpage exit - * -# @subpage file - * -# @subpage hash - * -# @subpage idna - * -# @subpage list - * -# @subpage mapping - * -# @subpage mbyte - * -# @subpage md5 - * -# @subpage memory - * -# @subpage message - * -# @subpage mime - * -# @subpage regex - * -# @subpage sha1 - * -# @subpage signal - * -# @subpage string */ #ifndef _MUTT_MUTT_H diff --git a/mutt/rfc2047.c b/mutt/rfc2047.c index 0690cec860e..65c07b30e34 100644 --- a/mutt/rfc2047.c +++ b/mutt/rfc2047.c @@ -663,7 +663,7 @@ void mutt_rfc2047_decode(char **pd) char *beg; /* Begin of encoded word */ enum ContentEncoding enc; /* ENCBASE64 or ENCQUOTEDPRINTABLE */ char *charset; /* Which charset */ - size_t charsetlen; /* Lenght of the charset */ + size_t charsetlen; /* Length of the charset */ char *text; /* Encoded text */ size_t textlen; /* Length of encoded text */ diff --git a/nntp.c b/nntp.c index 4541f1f2834..ba2933b4ede 100644 --- a/nntp.c +++ b/nntp.c @@ -67,7 +67,7 @@ static int nntp_connect_error(struct NntpServer *nserv) /** * nntp_capabilities - Get capabilities * @retval -1 Error, connection is closed - * @retval 0 Mode is reader, capabilities setted up + * @retval 0 Mode is reader, capabilities set up * @retval 1 Need to switch to reader mode */ static int nntp_capabilities(struct NntpServer *nserv) diff --git a/pager.c b/pager.c index 806964e9030..eed2b1e3554 100644 --- a/pager.c +++ b/pager.c @@ -1258,6 +1258,7 @@ static int format_line(struct Line **line_info, int n, unsigned char *buf, int f if (Charset_is_utf8) { + /* zero width space, zero width no-break space */ if (wc == 0x200B || wc == 0xFEFF) { mutt_debug(3, "skip zero-width character U+%04X\n", (unsigned short) wc); @@ -1315,10 +1316,14 @@ static int format_line(struct Line **line_info, int n, unsigned char *buf, int f last_special = special; } + /* no-break space, narrow no-break space */ if (IsWPrint(wc) || (Charset_is_utf8 && (wc == 0x00A0 || wc == 0x202F))) { if (wc == ' ') + { space = ch; + } + /* no-break space, narrow no-break space */ else if (Charset_is_utf8 && (wc == 0x00A0 || wc == 0x202F)) { /* Convert non-breaking space to normal space. The local variable