diff options
| -rw-r--r-- | compose.c | 2 | ||||
| -rw-r--r-- | crypt-gpgme.c | 12 | ||||
| -rw-r--r-- | crypt-mod.h | 4 | ||||
| -rw-r--r-- | curs_lib.c | 2 | ||||
| -rw-r--r-- | date.c | 2 | ||||
| -rw-r--r-- | doc/makedoc.c | 2 | ||||
| -rw-r--r-- | editmsg.c | 2 | ||||
| -rw-r--r-- | handler.c | 4 | ||||
| -rw-r--r-- | imap/util.c | 2 | ||||
| -rw-r--r-- | init.c | 8 | ||||
| -rw-r--r-- | intl/gettextP.h | 4 | ||||
| -rw-r--r-- | intl/plural.c | 4 | ||||
| -rw-r--r-- | keymap.c | 2 | ||||
| -rw-r--r-- | lib.c | 2 | ||||
| -rw-r--r-- | mbox.c | 2 | ||||
| -rw-r--r-- | mkdtemp.c | 2 | ||||
| -rw-r--r-- | mutt.h | 4 | ||||
| -rw-r--r-- | mutt_menu.h | 2 | ||||
| -rw-r--r-- | mutt_ssl.c | 2 | ||||
| -rw-r--r-- | mutt_ssl_gnutls.c | 2 | ||||
| -rw-r--r-- | muttlib.c | 2 | ||||
| -rw-r--r-- | mx.c | 2 | ||||
| -rw-r--r-- | parse.c | 4 | ||||
| -rw-r--r-- | pattern.c | 4 | ||||
| -rw-r--r-- | pop.c | 4 | ||||
| -rw-r--r-- | pop_auth.c | 4 | ||||
| -rw-r--r-- | pop_lib.c | 12 | ||||
| -rw-r--r-- | recvcmd.c | 2 | ||||
| -rw-r--r-- | regex.c | 4 | ||||
| -rw-r--r-- | send.c | 4 | ||||
| -rw-r--r-- | signal.c | 2 | ||||
| -rw-r--r-- | smime.c | 2 | ||||
| -rw-r--r-- | snprintf.c | 4 | ||||
| -rw-r--r-- | sort.h | 2 | ||||
| -rw-r--r-- | thread.c | 2 |
35 files changed, 60 insertions, 60 deletions
@@ -1264,7 +1264,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ } - /* 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 --git a/crypt-gpgme.c b/crypt-gpgme.c index 3e2cf319..6a404727 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -587,7 +587,7 @@ static gpgme_key_t *create_recipient_set (const char *keylist, { 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 @@ static void show_fingerprint (gpgme_key_t key, STATE *state) 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,8 +1288,8 @@ static void print_smime_keyinfo (const char* msg, gpgme_signature_t sig, 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 +/* 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 incremete for each call/signature. @@ -1783,7 +1783,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) 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 @@ -2785,7 +2785,7 @@ static const char *crypt_entry_fmt (char *dest, 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 --git a/crypt-mod.h b/crypt-mod.h index 08dfa43c..1e284a0b 100644 --- a/crypt-mod.h +++ b/crypt-mod.h @@ -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 @@ typedef struct crypt_module_functions /* - A structure to decribe a crypto module. + A structure to describe a crypto module. */ typedef struct crypt_module_specs { @@ -67,7 +67,7 @@ void mutt_refresh (void) } /* 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) @@ -77,7 +77,7 @@ time_t mutt_mktime (struct tm *t, int local) 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 --git a/doc/makedoc.c b/doc/makedoc.c index 3a06bf27..9d1d3b7c 100644 --- a/doc/makedoc.c +++ b/doc/makedoc.c @@ -750,7 +750,7 @@ static void print_confline (const char *varname, int type, const char *val, FILE ** - .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). @@ -163,7 +163,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur) /* * XXX - we have to play games with the message flags to avoid - * problematic behaviour with maildir folders. + * problematic behavior with maildir folders. * */ @@ -970,7 +970,7 @@ static int mutt_is_autoview (BODY *b) } else { - /* determine if this type is on ther user's auto_view list */ + /* determine if this type is on there user's auto_view list */ LIST *t = AutoViewList; for (; t; t = t->next) { @@ -1019,7 +1019,7 @@ static int alternative_handler (BODY *a, STATE *s) a = b; - /* First, search list of prefered types */ + /* First, search list of preferred types */ t = AlternativeOrderList; while (t && !choice) { diff --git a/imap/util.c b/imap/util.c index 657a2fb9..6295c5ff 100644 --- a/imap/util.c +++ b/imap/util.c @@ -161,7 +161,7 @@ int imap_hcache_del (IMAP_DATA* idata, unsigned int uid) #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) { @@ -259,7 +259,7 @@ int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags) 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 consiting 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 @@ int mutt_command_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]); @@ -2524,7 +2524,7 @@ int mutt_command_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]); @@ -2571,7 +2571,7 @@ int mutt_command_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]); diff --git a/intl/gettextP.h b/intl/gettextP.h index 9016b72e..f884cd46 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -94,8 +94,8 @@ struct expression 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 --git a/intl/plural.c b/intl/plural.c index 729574f6..30059a0f 100644 --- a/intl/plural.c +++ b/intl/plural.c @@ -345,7 +345,7 @@ static const short yycheck[] = { 1, #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 @@ static const short yycheck[] = { 1, #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 */ @@ -408,7 +408,7 @@ static int retry_generic (int menu, keycode_t *keys, int keyslen, int lastkey) /* 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) { @@ -787,7 +787,7 @@ char *mutt_read_line (char *s, size_t *size, FILE *fp, int *line, int flags) } 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; @@ -978,7 +978,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int *index_hint) 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 */ @@ -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"; @@ -481,7 +481,7 @@ enum /* 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 @@ typedef struct _context 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 --git a/mutt_menu.h b/mutt_menu.h index 6ca70d79..d459bef5 100644 --- a/mutt_menu.h +++ b/mutt_menu.h @@ -50,7 +50,7 @@ typedef struct menu_t 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. @@ -377,7 +377,7 @@ static int ssl_socket_open (CONNECTION * conn) 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 --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c index 970a9c90..b8682028 100644 --- a/mutt_ssl_gnutls.c +++ b/mutt_ssl_gnutls.c @@ -244,7 +244,7 @@ err_crt: */ 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) { @@ -1744,7 +1744,7 @@ void mutt_buffer_free (BUFFER **p) 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) @@ -1213,7 +1213,7 @@ static int imap_open_new_message (MESSAGE *msg, CONTEXT *dest, HEADER *hdr) #endif /* args: - * dest destintation mailbox + * dest destination mailbox * hdr message being copied (required for maildir support, because * the filename depends on the message flags) */ @@ -179,7 +179,7 @@ static PARAMETER *parse_parameters (const char *s) 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 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs, 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; @@ -646,7 +646,7 @@ static int eat_date (pattern_t *pat, BUFFER *s, BUFFER *err) 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 @@ int mutt_search_command (int cur, int op) 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(); @@ -56,7 +56,7 @@ static int fetch_message (char *line, void *file) * 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 @@ static header_cache_t *pop_hcache_open (POP_DATA *pop_data, const char *path) * Read headers * returns: * 0 on success - * -1 - conection lost, + * -1 - connection lost, * -2 - invalid command or execution error, * -3 - error writing to tempfile */ @@ -142,7 +142,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA *pop_data, const char *method) bail: sasl_dispose (&saslconn); - /* terminate SASL sessoin if the last responce is not +OK nor -ERR */ + /* terminate SASL sessoin if the last response is not +OK nor -ERR */ if (!mutt_strncmp (inbuf, "+ ", 2)) { snprintf (buf, sizeof (buf), "*\r\n"); @@ -289,7 +289,7 @@ static const pop_auth_t pop_authenticators[] = { /* * Authentication * 0 - successful, - * -1 - conection lost, + * -1 - connection lost, * -2 - login failed, * -3 - authentication canceled. */ @@ -145,7 +145,7 @@ static int fetch_auth (char *line, void *data) /* * 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 @@ static int pop_capabilities (POP_DATA *pop_data, int mode) /* * Open connection * 0 - successful, - * -1 - conection lost, + * -1 - connection lost, * -2 - invalid response. */ int pop_connect (POP_DATA *pop_data) @@ -256,7 +256,7 @@ int pop_connect (POP_DATA *pop_data) /* * 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 @@ void pop_logout (CONTEXT *ctx) /* * 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 @@ int pop_query_d (POP_DATA *pop_data, char *buf, size_t buflen, char *msg) 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 @@ int pop_query_d (POP_DATA *pop_data, char *buf, size_t buflen, char *msg) * 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) */ @@ -565,7 +565,7 @@ _("Can't decode all tagged attachments. MIME-forward the others?"))) == -1) /* * 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, @@ -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 @@ typedef struct #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 @@ -481,7 +481,7 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) /* 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 @@ ci_send_message (int flags, /* send mode */ /* 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) { @@ -128,7 +128,7 @@ void mutt_signal_init (void) /* 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); @@ -635,7 +635,7 @@ char *smime_get_field_from_db (char *mailbox, char *query, short public, short m /* 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) @@ -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 <holger@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. * @@ -48,7 +48,7 @@ THREAD *mutt_sort_subthreads (THREAD *, int); 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 */ @@ -1367,7 +1367,7 @@ static void clean_references (THREAD *brk, THREAD *cur) /* 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)) |