fix config order

Co-authored-by: Richard Russon <rich@flatcap.org>

diff --git a/init.h b/init.h
index f33fd1abf982ebf8b480169b930ce15e6a7dc998..ab141f8f6e3d09e137f4ac24d7025f0dbd5e6359 100644 (file)
--- a/init.h
+++ b/init.h
@@ -631,6 +631,19 @@ struct ConfigDef MuttVars[] = {
   ** $$crypt_replyencrypt,
   ** $$crypt_autosign, $$crypt_replysign and $$smime_is_default.
   */
+  { "crypt_chars",       DT_MBTABLE,    R_BOTH, &CryptChars, IP "SPsK " },
+  /*
+  ** .pp
+  ** Controls the characters used in cryptography flags.
+  ** .dl
+  ** .dt \fBCharacter\fP .dd \fBDefault\fP .dd \fBDescription\fP
+  ** .dt 1 .dd S .dd The mail is signed, and the signature is successfully verified.
+  ** .dt 2 .dd P .dd The mail is PGP encrypted.
+  ** .dt 3 .dd s .dd The mail is signed.
+  ** .dt 4 .dd K .dd The mail contains a PGP public key.
+  ** .dt 5 .dd <space> .dd The mail has no crypto info.
+  ** .de
+  */
   { "crypt_confirmhook",        DT_BOOL, R_NONE, &CryptConfirmhook, true },
   /*
   ** .pp
@@ -703,6 +716,17 @@ struct ConfigDef MuttVars[] = {
   ** you enable this variable.
   ** (Crypto only)
   */
+  { "crypt_protected_headers_subject", DT_STRING, R_NONE, &CryptProtectedHeadersSubject, IP "Encrypted subject" },
+  /*
+  ** .pp
+  ** When $$crypt_protected_headers_write is set, and the message is marked
+  ** for encryption, this will be substituted into the Subject field in the
+  ** message headers.
+  **
+  ** To prevent a subject from being substituted, unset this variable, or set it
+  ** to the empty string.
+  ** (Crypto only)
+  */
   { "crypt_protected_headers_write", DT_BOOL, R_NONE, &CryptProtectedHeadersWrite, false },
   /*
   ** .pp
@@ -716,17 +740,6 @@ struct ConfigDef MuttVars[] = {
   ** Currently Mutt only supports the Subject header.
   ** (Crypto only)
   */
-  { "crypt_protected_headers_subject", DT_STRING, R_NONE, &CryptProtectedHeadersSubject, IP "Encrypted subject" },
-  /*
-  ** .pp
-  ** When $$crypt_protected_headers_write is set, and the message is marked
-  ** for encryption, this will be substituted into the Subject field in the
-  ** message headers.
-  **
-  ** To prevent a subject from being substituted, unset this variable, or set it
-  ** to the empty string.
-  ** (Crypto only)
-  */
   { "crypt_replyencrypt",       DT_BOOL, R_NONE, &CryptReplyencrypt, true },
   /*
   ** .pp
@@ -1079,19 +1092,6 @@ struct ConfigDef MuttVars[] = {
   ** .dt 11 .dd <space> .dd The mail is read - %Z expando.
   ** .de
   */
-  { "crypt_chars",       DT_MBTABLE,    R_BOTH, &CryptChars, IP "SPsK " },
-  /*
-  ** .pp
-  ** Controls the characters used in cryptography flags.
-  ** .dl
-  ** .dt \fBCharacter\fP .dd \fBDefault\fP .dd \fBDescription\fP
-  ** .dt 1 .dd S .dd The mail is signed, and the signature is successfully verified.
-  ** .dt 2 .dd P .dd The mail is PGP encrypted.
-  ** .dt 3 .dd s .dd The mail is signed.
-  ** .dt 4 .dd K .dd The mail contains a PGP public key.
-  ** .dt 5 .dd <space> .dd The mail has no crypto info.
-  ** .de
-  */
   { "flag_safe", DT_BOOL, R_NONE, &FlagSafe, false },
   /*
   ** .pp
@@ -2272,6 +2272,13 @@ struct ConfigDef MuttVars[] = {
   ** The messages tagged with these tags are excluded and not loaded
   ** from notmuch DB to NeoMutt unless specified explicitly.
   */
+  { "nm_flagged_tag", DT_STRING, R_NONE, &NmFlaggedTag, IP "flagged" },
+  /*
+  ** .pp
+  ** This variable specifies notmuch tag which is used for flagged messages. The
+  ** variable is used to count flagged messages in DB and set the flagged flag when
+  ** modifying tags. All other NeoMutt commands use standard (e.g. maildir) flags.
+  */
   { "nm_open_timeout", DT_NUMBER|DT_NOT_NEGATIVE, R_NONE, &NmOpenTimeout, 5 },
   /*
   ** .pp
@@ -2315,20 +2322,6 @@ struct ConfigDef MuttVars[] = {
   ** This variable specifies the default tags applied to messages stored to the NeoMutt record.
   ** When set to 0 this variable disable the window feature.
   */
-  { "nm_unread_tag", DT_STRING, R_NONE, &NmUnreadTag, IP "unread" },
-  /*
-  ** .pp
-  ** This variable specifies notmuch tag which is used for unread messages. The
-  ** variable is used to count unread messages in DB and set the unread flag when
-  ** modifiying tags. All other NeoMutt commands use standard (e.g. maildir) flags.
-  */
-  { "nm_flagged_tag", DT_STRING, R_NONE, &NmFlaggedTag, IP "flagged" },
-  /*
-  ** .pp
-  ** This variable specifies notmuch tag which is used for flagged messages. The
-  ** variable is used to count flagged messages in DB and set the flagged flag when
-  ** modifying tags. All other NeoMutt commands use standard (e.g. maildir) flags.
-  */
   { "nm_replied_tag", DT_STRING, R_NONE, &NmRepliedTag, IP "replied" },
   /*
   ** .pp
@@ -2336,6 +2329,13 @@ struct ConfigDef MuttVars[] = {
   ** variable is used to set the replied flag when modifiying tags. All other NeoMutt
   ** commands use standard (e.g. maildir) flags.
   */
+  { "nm_unread_tag", DT_STRING, R_NONE, &NmUnreadTag, IP "unread" },
+  /*
+  ** .pp
+  ** This variable specifies notmuch tag which is used for unread messages. The
+  ** variable is used to count unread messages in DB and set the unread flag when
+  ** modifiying tags. All other NeoMutt commands use standard (e.g. maildir) flags.
+  */
 #endif
 #ifdef USE_NNTP
   { "nntp_authenticators", DT_STRING, R_NONE, &NntpAuthenticators, 0 },