From 448c32350c72f19c3052649c4f0f38533c49ac3a Mon Sep 17 00:00:00 2001 From: "Steffen (Daode) Nurpmeso" Date: Tue, 6 Dec 2016 16:11:09 +0100 Subject: [PATCH] ~?: hints on what is an environment-, what an internal variable.. While here, accompany (nail.1: "COMMAND ESCAPES", not "TILDE ESCAPES") and use the standard term. --- collect.c | 30 +++++++++++++++--------------- main.c | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/collect.c b/collect.c index 418fe3bc..33f795a1 100644 --- a/collect.c +++ b/collect.c @@ -82,7 +82,7 @@ static void mesedit(int c, struct header *hp); static void mespipe(char *cmd); /* Interpolate the named messages into the current message, possibly doing - * indent stuff. The flag argument is one of the tilde escapes: [mMfFuU]. + * indent stuff. The flag argument is one of the command escapes: [mMfFuU]. * Return a count of the number of characters now in the message, or -1 if an * error is encountered writing the message temporary */ static int forward(char *ms, FILE *fp, int f); @@ -778,7 +778,7 @@ jcont: /* We're done with -M or -m */ if(options & OPT_Mm_FLAG) goto jout; - /* No tilde escapes, interrupts not expected. Simply copy STDIN */ + /* No command escapes, interrupts not expected. Simply copy STDIN */ if (!(options & (OPT_INTERACTIVE | OPT_t_FLAG | OPT_TILDE_FLAG))) { linebuf = srealloc(linebuf, linesize = LINESIZE); while ((i = fread(linebuf, sizeof *linebuf, linesize, stdin)) > 0) { @@ -890,11 +890,11 @@ jputnl: memcpy(buf, n_unirepl, sizeof n_unirepl); else buf[0] = '?', buf[1] = '\0'; - n_err(_("Unknown tilde escape: ~%s\n"), buf); + n_err(_("Unknown command escape: ~%s\n"), buf); continue; } jearg: - n_err(_("Invalid tilde escape usage: %s\n"), linebuf); + n_err(_("Invalid command escape usage: %s\n"), linebuf); continue; case '!': /* Shell escape, send the balance of line to sh -c */ @@ -1099,33 +1099,33 @@ jearg: /* Last the lengthy help string. (Very ugly, but take care for * compiler supported string lengths :() */ puts(_( -"TILDE ESCAPES (to be placed after a newline) excerpt:\n" +"COMMAND ESCAPES (to be placed after a newline) excerpt:\n" "~. Commit and send message\n" "~: Execute a mail command\n" "~ Insert output of command\n" "~@ [] Edit attachment list\n" -"~A Insert *Sign* variable (`~a' inserts *sign*)\n" -"~c Add users to Cc: list (`~b' for Bcc:)\n" -"~d Read in *DEAD* (dead.letter)\n" -"~e Edit message via *EDITOR*" +"~A Insert *Sign* variable (`~a': insert *sign*)\n" +"~c Add users to Cc: list (`~b': to Bcc:)\n" +"~d Read in $DEAD (dead.letter)\n" +"~e Edit message via $EDITOR" )); puts(_( "~F Read in with headers, don't *indentprefix* lines\n" "~f Like ~F, but honour `ignore' / `retain' configuration\n" "~H Edit From:, Reply-To: and Sender:\n" -"~h Prompt for Subject:, To:, Cc: and blind Bcc:\n" +"~h Prompt for Subject:, To:, Cc: and \"blind\" Bcc:\n" "~i Insert a value and a newline\n" "~M Read in with headers, *indentprefix* (`~m': `retain' etc.)\n" -"~p Print current message compose buffer\n" -"~r Read in a file (`~R' *indentprefix* lines)" +"~p Show current message compose buffer\n" +"~r Read in a file (`~R': *indentprefix* lines)" )); puts(_( "~s Set Subject:\n" "~t Add users to To: list\n" -"~u Read in message(s) without headers (`~U' indents lines)\n" -"~v Edit message via *VISUAL*\n" +"~u Read in message(s) without headers (`~U': indent lines)\n" +"~v Edit message via $VISUAL\n" "~w Write message onto file\n" -"~x Abort composition, discard message (`~q' saves in *DEAD*)\n" +"~x Abort composition, discard message (`~q': save in $DEAD)\n" "~| Pipe message through shell filter" )); if(cnt != 2) diff --git a/main.c b/main.c index 1263e74b..83a0bd59 100644 --- a/main.c +++ b/main.c @@ -803,7 +803,7 @@ joarg: } break; case '~': - /* Enable tilde escapes even in non-interactive mode */ + /* Enable command escapes even in non-interactive mode */ options |= OPT_TILDE_FLAG; break; case '#': -- 2.11.4.GIT