--- mutt-1.5.11/init.h_gpg 2006-05-30 19:53:11.000000000 +0200 +++ mutt-1.5.11/init.h 2006-05-30 21:02:03.000000000 +0200 @@ -77,7 +77,7 @@ #endif /* _MAKEDOC */ #ifndef ISPELL -#define ISPELL "ispell" +#define ISPELL "/usr/bin/aspell -c" #endif /* build complete documentation */ @@ -1765,7 +1765,7 @@ /* XXX Default values! */ - { "pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, 0}, + { "pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, UL "/usr/bin/gpg %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"}, /* ** .pp ** This format strings specifies a command which is used to decode @@ -1796,19 +1796,19 @@ ** %r is the only printf-like sequence used with this format. ** (PGP only) */ - { "pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, 0}, + { "pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, UL "/usr/bin/gpg --no-verbose --quiet --batch --output - --verify %s %f" }, /* ** .pp ** This command is used to verify PGP signatures. ** (PGP only) */ - { "pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, 0}, + { "pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, UL "/usr/bin/gpg %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" }, /* ** .pp ** This command is used to decrypt a PGP encrypted message. ** (PGP only) */ - { "pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, 0 }, + { "pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, UL "/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" }, /* ** .pp ** This format is used to create a old-style "clearsigned" PGP @@ -1816,47 +1816,47 @@ ** \fBdeprecated\fP. ** (PGP only) */ - { "pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, 0}, + { "pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, UL "/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" }, /* ** .pp ** This command is used to create the detached PGP signature for a ** multipart/signed PGP/MIME body part. ** (PGP only) */ - { "pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, 0}, + { "pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, UL "pgpewrap /usr/bin/gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" }, /* ** .pp ** This command is used to both sign and encrypt a body part. ** (PGP only) */ - { "pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, 0}, + { "pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, UL "pgpewrap /usr/bin/gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" }, /* ** .pp ** This command is used to encrypt a body part without signing it. ** (PGP only) */ - { "pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, 0}, + { "pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, UL "/usr/bin/gpg --no-verbose --import %f" }, /* ** .pp ** This command is used to import a key from a message into ** the user's public key ring. ** (PGP only) */ - { "pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, 0}, + { "pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, UL "/usr/bin/gpg --no-verbose --export --armor %r" }, /* ** .pp ** This command is used to export a public key from the user's ** key ring. ** (PGP only) */ - { "pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, 0}, + { "pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, UL "/usr/bin/gpg --verbose --batch --fingerprint --check-sigs %r" }, /* ** .pp ** This command is used to verify key information from the key selection ** menu. ** (PGP only) */ - { "pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, 0}, + { "pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, UL "/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" }, /* ** .pp ** This command is used to list the secret key ring's contents. The @@ -1867,7 +1867,7 @@ ** with mutt. ** (PGP only) */ - { "pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, 0}, + { "pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, UL "/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-keys %r" }, /* ** .pp ** This command is used to list the public key ring's contents. The @@ -2562,7 +2562,7 @@ ** mutt scores are always greater than or equal to zero, the default setting ** of this variable will never mark a message read. */ - { "send_charset", DT_STR, R_NONE, UL &SendCharset, UL "us-ascii:iso-8859-1:utf-8" }, + { "send_charset", DT_STR, R_NONE, UL &SendCharset, UL "iso-8859-1:iso-8859-2:iso-8859-7:iso-8859-9:koi8-r:iso-2022-jp:euc-kr:gb2312:big5:utf-8" }, /* ** .pp ** A list of character sets for outgoing messages. Mutt will use the