From: Richard Russon Date: Fri, 8 Feb 2019 19:46:05 +0000 (+0000) Subject: eliminate asymmetric quotes X-Git-Tag: 2019-10-25~372^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=834c406bcd3b7bf2706ca48dd4f0055bd10f29d9;p=neomutt eliminate asymmetric quotes --- diff --git a/color.c b/color.c index e505963fa..89fc61d1e 100644 --- a/color.c +++ b/color.c @@ -726,7 +726,7 @@ static enum CommandResult add_pattern(struct ColorLineHead *top, const char *s, struct Buffer *err, bool is_index, int match) { /* is_index used to store compiled pattern - * only for `index' color object + * only for 'index' color object * when called from mutt_parse_color() */ struct ColorLine *tmp = NULL; diff --git a/copy.c b/copy.c index 0830c04ca..e68db3a4b 100644 --- a/copy.c +++ b/copy.c @@ -395,7 +395,7 @@ int mutt_copy_hdr(FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, * * #CH_NONEWLINE don't output a newline after the header * * #CH_NOSTATUS ignore the Status: and X-Status: * * #CH_PREFIX quote header with $indent_string - * * #CH_REORDER output header in order specified by `hdr_order' + * * #CH_REORDER output header in order specified by 'hdr_order' * * #CH_TXTPLAIN generate text/plain MIME headers [hack alert.] * * #CH_UPDATE write new Status: and X-Status: * * #CH_UPDATE_LEN write new Content-Length: and Lines: diff --git a/email/address.c b/email/address.c index a85380c31..bc1ebd2c6 100644 --- a/email/address.c +++ b/email/address.c @@ -1174,7 +1174,7 @@ size_t mutt_addr_write(char *buf, size_t buflen, struct Address *addr, bool disp mutt_addr_write_single(pbuf, buflen + 1, addr, display); /* this should be safe since we always have at least 1 char passed into - the above call, which means `pbuf' should always be nul terminated */ + the above call, which means 'pbuf' should always be nul terminated */ len = mutt_str_strlen(pbuf); pbuf += len; buflen -= len; diff --git a/email/envelope.c b/email/envelope.c index 8faf81820..bd05306a2 100644 --- a/email/envelope.c +++ b/email/envelope.c @@ -211,8 +211,8 @@ void mutt_env_to_local(struct Envelope *env) mutt_addrlist_to_local(env->mail_followup_to); } -/* Note that `a' in the `env->a' expression is macro argument, not - * "real" name of an `env' compound member. Real name will be substituted +/* Note that 'a' in the 'env->a' expression is macro argument, not + * "real" name of an 'env' compound member. Real name will be substituted * by preprocessor at the macro-expansion time. * Note that #a escapes and double quotes the argument. */ diff --git a/email/parse.c b/email/parse.c index f3d308339..eecf67a69 100644 --- a/email/parse.c +++ b/email/parse.c @@ -180,7 +180,7 @@ static void parse_parameters(struct ParameterList *param, const char *s) { new->value = mutt_str_strdup(buffer); - mutt_debug(2, "parse_parameter: '%s' = `%s'\n", + mutt_debug(2, "parse_parameter: '%s' = '%s'\n", new->attribute ? new->attribute : "", new->value ? new->value : ""); /* Add this parameter to the list */ @@ -767,7 +767,7 @@ int mutt_rfc822_parse_line(struct Envelope *env, struct Email *e, char *line, #endif case 'o': - /* field `Organization:' saves only for pager! */ + /* field 'Organization:' saves only for pager! */ if (mutt_str_strcasecmp(line + 1, "rganization") == 0) { if (!env->organization && (mutt_str_strcasecmp(p, "unknown") != 0)) diff --git a/index.c b/index.c index 4b562fe30..b69bc5081 100644 --- a/index.c +++ b/index.c @@ -1545,7 +1545,7 @@ int mutt_index_menu(void) break; /* -------------------------------------------------------------------- - * `index' specific commands + * 'index' specific commands */ case OP_MAIN_DELETE_PATTERN: diff --git a/init.h b/init.h index a8ea7c7d4..85ea505e2 100644 --- a/init.h +++ b/init.h @@ -368,8 +368,8 @@ struct ConfigDef MuttVars[] = { ** .pp ** When \fIset\fP, Mutt assumes the presence of a List-Post header ** means the recipient is subscribed to the list. Unless the mailing list - ** is in the ``unsubscribe'' or ``unlist'' lists, it will be added - ** to the ``$subscribe'' list. Parsing and checking these things slows + ** is in the "unsubscribe" or "unlist" lists, it will be added + ** to the "$subscribe" list. Parsing and checking these things slows ** header reading down, so this option is disabled by default. */ { "auto_tag", DT_BOOL, R_NONE, &AutoTag, false }, @@ -3270,10 +3270,10 @@ struct ConfigDef MuttVars[] = { /* ** .pp ** This variable provides a toggle. When active, the From: header will be - ** extracted from the current mail's `X-Original-To:' header. This setting + ** extracted from the current mail's 'X-Original-To:' header. This setting ** does not have precedence over "$reverse_realname". ** .pp - ** Assuming `fast_reply' is disabled, this option will prompt the user with a + ** Assuming 'fast_reply' is disabled, this option will prompt the user with a ** prefilled From: header. */ { "resolve", DT_BOOL, R_NONE, &Resolve, true }, @@ -3539,12 +3539,12 @@ struct ConfigDef MuttVars[] = { ** This contains the list of characters which you would like to treat ** as folder separators for displaying paths in the sidebar. ** .pp - ** Local mail is often arranged in directories: `dir1/dir2/mailbox'. + ** Local mail is often arranged in directories: 'dir1/dir2/mailbox'. ** .ts ** set sidebar_delim_chars='/' ** .te ** .pp - ** IMAP mailboxes are often named: `folder1.folder2.mailbox'. + ** IMAP mailboxes are often named: 'folder1.folder2.mailbox'. ** .ts ** set sidebar_delim_chars='.' ** .te diff --git a/keymap.c b/keymap.c index 0871d112f..61d2d5ad3 100644 --- a/keymap.c +++ b/keymap.c @@ -1268,7 +1268,7 @@ enum CommandResult mutt_parse_bind(struct Buffer *buf, struct Buffer *s, { for (int i = 0; i < nummenus; ++i) { - km_bindkey(key, menu[i], OP_NULL); /* the `unbind' command */ + km_bindkey(key, menu[i], OP_NULL); /* the 'unbind' command */ } } else diff --git a/mbox/mbox.c b/mbox/mbox.c index 36c8ea1ab..04a46d0f2 100644 --- a/mbox/mbox.c +++ b/mbox/mbox.c @@ -765,12 +765,12 @@ static int fseek_last_message(FILE *f) fseek(f, 0, SEEK_END); pos = ftello(f); - /* Set `bytes_read' to the size of the last, probably partial, buffer; - * 0 < `bytes_read' <= `BUFSIZ'. */ + /* Set 'bytes_read' to the size of the last, probably partial, buffer; + * 0 < 'bytes_read' <= 'BUFSIZ'. */ bytes_read = pos % BUFSIZ; if (bytes_read == 0) bytes_read = BUFSIZ; - /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all + /* Make 'pos' a multiple of 'BUFSIZ' (0 if the file is short), so that all * reads will be on block boundaries, which might increase efficiency. */ while ((pos -= bytes_read) >= 0) { @@ -780,7 +780,7 @@ static int fseek_last_message(FILE *f) bytes_read = fread(buffer, sizeof(char), bytes_read, f); if (bytes_read == 0) return -1; - /* 'i' is Index into `buffer' for scanning. */ + /* 'i' is Index into 'buffer' for scanning. */ for (int i = bytes_read; i >= 0; i--) { if (mutt_str_startswith(buffer + i, "\n\nFrom ", CASE_MATCH)) @@ -1277,9 +1277,9 @@ static int mbox_mbox_sync(struct Mailbox *m, int *index_hint) } } - /* save the new offset for this message. we add `offset' because the + /* save the new offset for this message. we add 'offset' because the * temporary file only contains saved message which are located after - * `offset' in the real mailbox + * 'offset' in the real mailbox */ new_offset[i - first].hdr = ftello(fp) + offset; diff --git a/muttlib.c b/muttlib.c index 81d33317c..a5838a491 100644 --- a/muttlib.c +++ b/muttlib.c @@ -1042,7 +1042,7 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c break; /* bad format */ src++; - /* eat the `if' part of the string */ + /* eat the 'if' part of the string */ cp = if_str; count = 0; lrbalance = 1; @@ -1079,7 +1079,7 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c } *cp = 0; - /* eat the `else' part of the string (optional) */ + /* eat the 'else' part of the string (optional) */ if (*src == '&') src++; /* skip the & */ cp = else_str; @@ -1120,7 +1120,7 @@ void mutt_expando_format(char *buf, size_t buflen, size_t col, int cols, const c if (!*src) break; /* bad format */ - src++; /* move past the trailing `>' (formerly '?') */ + src++; /* move past the trailing '>' (formerly '?') */ } /* handle generic cases first */ @@ -1508,7 +1508,7 @@ void mutt_encode_path(char *buf, size_t buflen, const char *src) { char *p = mutt_str_strdup(src); int rc = mutt_ch_convert_string(&p, Charset, "us-ascii", 0); - /* `src' may be NULL, such as when called from the pop3 driver. */ + /* 'src' may be NULL, such as when called from the pop3 driver. */ size_t len = mutt_str_strfcpy(buf, (rc == 0) ? p : src, buflen); /* convert the path to POSIX "Portable Filename Character Set" */ diff --git a/mx.c b/mx.c index ebf39ff14..9ce6f89e0 100644 --- a/mx.c +++ b/mx.c @@ -328,7 +328,7 @@ struct Context *mx_mbox_open(struct Mailbox *m, int flags) mutt_make_label_hash(m); - /* if the user has a `push' command in their .neomuttrc, or in a folder-hook, + /* if the user has a 'push' command in their .neomuttrc, or in a folder-hook, * it will cause the progress messages not to be displayed because * mutt_refresh() will think we are in the middle of a macro. so set a * flag to indicate that we should really refresh the screen. diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index 5132e3cbc..8fbf4f7d1 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -1053,7 +1053,7 @@ static gpgme_key_t *create_recipient_set(const char *keylist, gpgme_protocol_t p rset[rset_n++] = key; else { - mutt_error(_("error adding recipient `%s': %s\n"), buf, gpgme_strerror(err)); + mutt_error(_("error adding recipient '%s': %s\n"), buf, gpgme_strerror(err)); rset[rset_n] = NULL; free_recipient_set(&rset); gpgme_release(context); diff --git a/options.h b/options.h index 1d081e26c..2d26f12c6 100644 --- a/options.h +++ b/options.h @@ -36,7 +36,7 @@ WHERE bool OptIgnoreMacroEvents; /**< (pseudo) don't process macro/push/exec ev WHERE bool OptKeepQuiet; /**< (pseudo) shut up the message and refresh functions while we are executing an external program. */ WHERE bool OptMenuCaller; /**< (pseudo) tell menu to give caller a take */ WHERE bool OptMsgErr; /**< (pseudo) used by mutt_error/mutt_message */ -WHERE bool OptNeedRescore; /**< (pseudo) set when the `score' command is used */ +WHERE bool OptNeedRescore; /**< (pseudo) set when the 'score' command is used */ WHERE bool OptNeedResort; /**< (pseudo) used to force a re-sort */ #ifdef USE_NNTP WHERE bool OptNews; /**< (pseudo) used to change reader mode */ diff --git a/pattern.c b/pattern.c index 84592fca8..de51bb602 100644 --- a/pattern.c +++ b/pattern.c @@ -590,7 +590,7 @@ static bool eat_date(struct Pattern *pat, struct Buffer *s, struct Buffer *err) } memset(&min, 0, sizeof(min)); - /* the `0' time is Jan 1, 1970 UTC, so in order to prevent a negative time + /* the '0' time is Jan 1, 1970 UTC, so in order to prevent a negative time when doing timezone conversion, we use Jan 2, 1970 UTC as the base here */ min.tm_mday = 2; diff --git a/postpone.c b/postpone.c index d43629a48..9d44e9be8 100644 --- a/postpone.c +++ b/postpone.c @@ -280,7 +280,7 @@ static struct Email *select_msg(struct Context *ctx) * mutt_get_postponed - Recall a postponed message * @param[in] ctx Context info, used when recalling a message to which we reply * @param[in] hdr envelope/attachment info for recalled message - * @param[out] cur if message was a reply, `cur' is set to the message which `hdr' is in reply to + * @param[out] cur if message was a reply, 'cur' is set to the message which 'hdr' is in reply to * @param[in] fcc fcc for the recalled message * @param[in] fcclen max length of fcc * @retval -1 Error/no messages diff --git a/send.c b/send.c index a2b0baf4e..225f59b82 100644 --- a/send.c +++ b/send.c @@ -1890,7 +1890,7 @@ int ci_send_message(int flags, struct Email *msg, const char *tempfile, /* this is handled here so that the user can match ~f in send-hook */ if (cur && ReverseName && !(flags & (SEND_POSTPONED | SEND_RESEND))) { - /* we shouldn't have to worry about freeing `msg->env->from' before + /* we shouldn't have to worry about freeing 'msg->env->from' before * setting it here since this code will only execute when doing some * sort of reply. the pointer will only be set when using the -H command * line option. @@ -1911,14 +1911,14 @@ int ci_send_message(int flags, struct Email *msg, const char *tempfile, } if (cur && ReplyWithXorig && !(flags & (SEND_POSTPONED | SEND_RESEND | SEND_FORWARD))) { - /* We shouldn't have to worry about freeing `msg->env->from' before + /* We shouldn't have to worry about freeing 'msg->env->from' before * setting it here since this code will only execute when doing some * sort of reply. The pointer will only be set when using the -H command * line option. * - * If there is already a from address recorded in `msg->env->from', + * If there is already a from address recorded in 'msg->env->from', * then it theoretically comes from ReverseName handling, and we don't use - * the `X-Orig-To header'. + * the 'X-Orig-To header'. */ if (cur->env->x_original_to && !msg->env->from) { @@ -1962,7 +1962,7 @@ int ci_send_message(int flags, struct Email *msg, const char *tempfile, } /* 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 + * $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 evaluated */ diff --git a/sendlib.c b/sendlib.c index 9d7206aa1..5d5ed5a89 100644 --- a/sendlib.c +++ b/sendlib.c @@ -1062,10 +1062,10 @@ struct Content *mutt_get_content_info(const char *fname, struct Body *b) * @param path Path to attachment * @retval num MIME type, e.g. #TYPE_IMAGE * - * Given a file at `path`, see if there is a registered MIME type. + * Given a file at 'path', see if there is a registered MIME type. * Returns the major MIME type, and copies the subtype to "d". First look * in a system mime.types if we can find one, then look for ~/.mime.types. - * The longest match is used so that we can match `ps.gz' when `gz' also + * The longest match is used so that we can match 'ps.gz' when 'gz' also * exists. */ int mutt_lookup_mime_type(struct Body *att, const char *path) @@ -1894,7 +1894,7 @@ static int fold_one_header(FILE *fp, const char *tag, const char *value, { int fold = 0; - /* find the next word and place it in `buf'. it may start with + /* find the next word and place it in 'buf'. it may start with * whitespace we can fold before */ const char *next = mutt_str_find_word(p); l = MIN(sizeof(buf) - 1, next - p); @@ -2224,7 +2224,7 @@ int mutt_rfc822_write_header(FILE *fp, struct Envelope *env, fputs(mutt_date_make_date(buf, sizeof(buf)), fp); /* UseFrom is not consulted here so that we can still write a From: - * field if the user sets it with the `my_hdr' command + * field if the user sets it with the 'my_hdr' command */ if (env->from && !privacy) { @@ -3186,7 +3186,7 @@ int mutt_write_fcc(const char *path, struct Email *e, const char *msgid, stat(path, &st); } - e->read = !post; /* make sure to put it in the `cur' directory (maildir) */ + e->read = !post; /* make sure to put it in the 'cur' directory (maildir) */ onm_flags = MUTT_ADD_FROM; if (post) onm_flags |= MUTT_SET_DRAFT;