From: Richard Russon <rich@flatcap.org>
Date: Thu, 15 Mar 2018 20:21:33 +0000 (+0000)
Subject: restore ignore_linear_white_space option
X-Git-Tag: neomutt-20180323~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38072d12289f100c33b1bbeeb1a7642c7d27863c;p=neomutt

restore ignore_linear_white_space option

This is a dummy option -- it's not needed any more.
In the future this and several other options will be deprecated and
removed.
---

diff --git a/doc/neomutt.man b/doc/neomutt.man
index 2107fe6a2..37a0eeecb 100644
--- a/doc/neomutt.man
+++ b/doc/neomutt.man
@@ -20,7 +20,7 @@
 .TH neomutt 1 "January 2009" Unix "User Manuals"
 .SH NAME
 neomutt \- The Neomutt Mail User Agent
-.SH SYNOPSIS
+.SH SYNTAX
 .PP
 .B neomutt
 [\-GnRyzZ]
diff --git a/doc/smime_keys.1 b/doc/smime_keys.1
index 5a7ac4d46..171261c31 100644
--- a/doc/smime_keys.1
+++ b/doc/smime_keys.1
@@ -22,7 +22,7 @@
 .TH smime_keys 1 "May 2009" Unix "User Manuals"
 .SH "NAME"
 smime_keys \- Utility to add S/MIME certificate to the internal database used by neomutt
-.SH SYNOPSIS
+.SH SYNTAX
 .PP
 .B smime_keys
 <operation>  [file(s) | keyID [file(s)]]
diff --git a/init.h b/init.h
index e1528655b..6a01b9a73 100644
--- a/init.h
+++ b/init.h
@@ -82,6 +82,9 @@
 #define ISPELL "ispell"
 #endif
 
+/* This option is deprecated */
+bool IgnoreLinearWhiteSpace = false;
+
 struct Option MuttVars[] = {
   /*++*/
 
@@ -4378,9 +4381,10 @@ struct Option MuttVars[] = {
   */
   /*--*/
 
-  { "pgp_encrypt_self",   DT_QUAD,    R_NONE,  UL &PgpEncryptSelf,   MUTT_NO },
-  { "smime_encrypt_self", DT_QUAD,    R_NONE,  UL &SmimeEncryptSelf, MUTT_NO },
-  { "wrapmargin",         DT_NUMBER,  R_PAGER, UL &Wrap,             0 },
+  { "ignore_linear_white_space", DT_BOOL,   R_NONE,  UL &IgnoreLinearWhiteSpace, 0       },
+  { "pgp_encrypt_self",          DT_QUAD,   R_NONE,  UL &PgpEncryptSelf,         MUTT_NO },
+  { "smime_encrypt_self",        DT_QUAD,   R_NONE,  UL &SmimeEncryptSelf,       MUTT_NO },
+  { "wrapmargin",                DT_NUMBER, R_PAGER, UL &Wrap,                   0       },
   /*
   ** .pp
   ** (DEPRECATED) Equivalent to setting $$wrap with a negative value.