From 893e59ece31445060c2e785c85be43cf7b3c5052 Mon Sep 17 00:00:00 2001
From: "Steffen (Daode) Nurpmeso" <steffen@sdaoden.eu>
Date: Fri, 25 Aug 2017 23:47:12 +0200
Subject: [PATCH] POSIX mirrors *ask* onto *asksub*, "drop" former

---
 accmacvar.c |  6 ++++++
 collect.c   |  2 +-
 nail.1      | 10 +++-------
 nail.h      |  3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/accmacvar.c b/accmacvar.c
index ca5bd230..7c15efdd 100644
--- a/accmacvar.c
+++ b/accmacvar.c
@@ -903,6 +903,9 @@ a_amv_var_check_vips(enum a_amv_var_vip_mode avvm, enum okeys okey,
       switch(okey){
       default:
          break;
+      case ok_b_ask:
+         ok_bset(asksub);
+         break;
       case ok_b_debug:
          n_poption |= n_PO_DEBUG;
          break;
@@ -965,6 +968,9 @@ a_amv_var_check_vips(enum a_amv_var_vip_mode avvm, enum okeys okey,
       switch(okey){
       default:
          break;
+      case ok_b_ask:
+         ok_bclear(asksub);
+         break;
       case ok_b_debug:
          n_poption &= ~n_PO_DEBUG;
          break;
diff --git a/collect.c b/collect.c
index 8d525e3a..236ec6be 100644
--- a/collect.c
+++ b/collect.c
@@ -1850,7 +1850,7 @@ collect(struct header *hp, int printheaders, struct message *mp,
          t |= GCOMMA;
 
       if(n_psonce & n_PSO_INTERACTIVE){
-         if(hp->h_subject == NULL && (ok_blook(ask) || ok_blook(asksub)))
+         if(hp->h_subject == NULL && ok_blook(asksub)/* *ask* auto warped! */)
             t &= ~GNL, getfields |= GSUBJECT;
 
          if(hp->h_to == NULL)
diff --git a/nail.1 b/nail.1
index 6abc8d53..a0794edf 100644
--- a/nail.1
+++ b/nail.1
@@ -8064,11 +8064,6 @@ to be appended to the end rather than prepended.
 This should always be set.
 .
 .Mx
-.It Va ask
-\*(BO Causes \*(UA to prompt for the subject upon entering compose mode
-unless a subject already exists.
-.
-.Mx
 .It Va askatend
 \*(BO Causes the prompts for
 .Ql Cc:
@@ -8109,8 +8104,9 @@ variable is ignored when this variable is set.
 .
 .Mx
 .It Va asksub
-\*(BO Alternative name for
-.Va ask .
+.\" The alternative *ask* is not documented on purpose
+\*(BO Causes \*(UA to prompt for the subject upon entering compose mode
+unless a subject already exists.
 .
 .Mx
 .It Va attrlist
diff --git a/nail.h b/nail.h
index d94f0229..e59462ba 100644
--- a/nail.h
+++ b/nail.h
@@ -1503,7 +1503,8 @@ enum okeys {
 ok_v_agent_shell_lookup,
    ok_b_allnet,
    ok_b_append,
-   ok_b_ask,
+   /* *ask* is auto-mapped to *asksub* as imposed by standard! */
+   ok_b_ask,                           /* {vip=1} */
    ok_b_askatend,
    ok_b_askattach,
    ok_b_askbcc,
-- 
2.11.4.GIT