diff options
author | Patrick Totzke <patricktotzke@gmail.com> | 2012-05-17 15:47:23 +0100 |
---|---|---|
committer | Patrick Totzke <patricktotzke@gmail.com> | 2012-05-17 15:47:23 +0100 |
commit | 08c2ee1d88e69aa5df27b74d1cebd3c0c8be68f6 (patch) | |
tree | 2dde7d7db9146918242f2c289c64e587706b3f09 /alot/defaults | |
parent | 138f13c682f6a63da67cced1f0c267b5f6f349b8 (diff) | |
parent | 56b0b8a0f310403d4664649ab9b69d3cd765dbe5 (diff) |
Merge branch '0.3-feature-pyme' into staging
Conflicts:
alot/settings/__init__.py
alot/settings/checks.py
docs/source/generate_configs.py
Diffstat (limited to 'alot/defaults')
-rw-r--r-- | alot/defaults/alot.rc.spec | 6 | ||||
-rw-r--r-- | alot/defaults/config.stub | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/alot/defaults/alot.rc.spec b/alot/defaults/alot.rc.spec index 7d6715d9..dc1c3c1f 100644 --- a/alot/defaults/alot.rc.spec +++ b/alot/defaults/alot.rc.spec @@ -181,6 +181,12 @@ prompt_suffix = string(default=':') # :ref:`signature_as_attachment <signature-as-attachment>` is set to True signature_filename = string(default=None) + # Outgoing messages will be GPG signed by default if this is set to True. + sign_by_default = boolean(default=False) + + # The GPG key ID you want to use with this account. If unset, alot will + # use your default key. + gpg_key = gpg_key_hint(default=None) # address book for this account [[[abook]]] diff --git a/alot/defaults/config.stub b/alot/defaults/config.stub index 9d6f3661..94f78c4d 100644 --- a/alot/defaults/config.stub +++ b/alot/defaults/config.stub @@ -67,6 +67,7 @@ t = 'refine To' b = 'refine Bcc' c = 'refine Cc' + S = togglesign select = edit H = toggleheaders |