projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
init.h
diff --git
a/init.h
b/init.h
index
5886c78
..
4e78663
100644
(file)
--- a/
init.h
+++ b/
init.h
@@
-105,6
+105,21
@@
struct feature_t {
# ifndef USE_GNUTLS
# define USE_GNUTLS
# endif
# ifndef USE_GNUTLS
# define USE_GNUTLS
# endif
+# ifndef USE_DOTLOCK
+# define USE_DOTLOCK
+# endif
+# ifndef DL_STANDALONE
+# define DL_STANDALONE
+# endif
+# ifndef USE_HCACHE
+# define USE_HCACHE
+# endif
+# ifndef HAVE_LIBIDN
+# define HAVE_LIBIDN
+# endif
+# ifndef HAVE_GETADDRINFO
+# define HAVE_GETADDRINFO
+# endif
#endif
struct option_t MuttVars[] = {
#endif
struct option_t MuttVars[] = {
@@
-1434,7
+1449,7
@@
struct option_t MuttVars[] = {
** This variable controls the number of lines of context that are given
** when scrolling through menus. (Similar to ``$$pager_context''.)
*/
** This variable controls the number of lines of context that are given
** when scrolling through menus. (Similar to ``$$pager_context''.)
*/
- {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF,
0
},
+ {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF,
1
},
/*
** .pp
** When \fIunset\fP, the bottom entry of menus will never scroll up past
/*
** .pp
** When \fIunset\fP, the bottom entry of menus will never scroll up past
@@
-1668,7
+1683,7
@@
struct option_t MuttVars[] = {
**
** .pp
** This variable controls how many news articles to cache per newsgroup
**
** .pp
** This variable controls how many news articles to cache per newsgroup
- ** (if caching is enabled, see $$n
ews
_cache_dir) and how many news articles
+ ** (if caching is enabled, see $$n
ntp
_cache_dir) and how many news articles
** to show in the ``index'' menu.
** .pp
** If there're more articles than defined with $$nntp_context, all older ones
** to show in the ``index'' menu.
** .pp
** If there're more articles than defined with $$nntp_context, all older ones
@@
-2372,7
+2387,7
@@
struct option_t MuttVars[] = {
** servers will probably desire 587, the mail submission port.
*/
#endif
** servers will probably desire 587, the mail submission port.
*/
#endif
-#if defined(USE_SSL)
||defined(USE_NSS)||
defined(USE_GNUTLS)
+#if defined(USE_SSL)
||
defined(USE_GNUTLS)
#ifdef USE_SSL
{"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0},
/*
#ifdef USE_SSL
{"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0},
/*
@@
-2399,7
+2414,7
@@
struct option_t MuttVars[] = {
{"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates"},
/*
** .pp
{"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates"},
/*
** .pp
- ** Availability: SSL or
NSS or
GNUTLS
+ ** Availability: SSL or GNUTLS
**
** .pp
** This variable specifies the file where the certificates you trust
**
** .pp
** This variable specifies the file where the certificates you trust
@@
-2414,11
+2429,11
@@
struct option_t MuttVars[] = {
** .pp
** Example: \fTset certificate_file=~/.muttng/certificates\fP
*/
** .pp
** Example: \fTset certificate_file=~/.muttng/certificates\fP
*/
-# if
ndef USE_GNUTLS
+# if
defined(_MAKEDOC) || !defined (USE_GNUTLS)
{"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1},
/*
** .pp
{"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1},
/*
** .pp
- ** Availability: SSL
or NSS
+ ** Availability: SSL
**
** .pp
** If set to \fIyes\fP, Mutt-ng will use CA certificates in the
**
** .pp
** If set to \fIyes\fP, Mutt-ng will use CA certificates in the
@@
-2428,7
+2443,7
@@
struct option_t MuttVars[] = {
{"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, 0},
/*
** .pp
{"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, 0},
/*
** .pp
- ** Availability: SSL
or NSS
+ ** Availability: SSL
**
** .pp
** The file which includes random data that is used to initialize SSL
**
** .pp
** The file which includes random data that is used to initialize SSL
@@
-2437,7
+2452,7
@@
struct option_t MuttVars[] = {
{"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, 1},
/*
** .pp
{"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, 1},
/*
** .pp
- ** Availability: SSL
or NSS
+ ** Availability: SSL
**
** .pp
** This variables specifies whether to attempt to use SSLv2 in the
**
** .pp
** This variables specifies whether to attempt to use SSLv2 in the
@@
-2447,7
+2462,7
@@
struct option_t MuttVars[] = {
{"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1},
/*
** .pp
{"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1},
/*
** .pp
- ** Availability: SSL or
NSS or
GNUTLS
+ ** Availability: SSL or GNUTLS
**
** .pp
** This variables specifies whether to attempt to use SSLv3 in the
**
** .pp
** This variables specifies whether to attempt to use SSLv3 in the
@@
-2456,7
+2471,7
@@
struct option_t MuttVars[] = {
{"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, 1},
/*
** .pp
{"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, 1},
/*
** .pp
- ** Availability: SSL or
NSS or
GNUTLS
+ ** Availability: SSL or GNUTLS
**
** .pp
** This variables specifies whether to attempt to use TLSv1 in the
**
** .pp
** This variables specifies whether to attempt to use TLSv1 in the