diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/obsolete/pgg-def.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/obsolete/pgg-def.el')
-rw-r--r-- | lisp/obsolete/pgg-def.el | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lisp/obsolete/pgg-def.el b/lisp/obsolete/pgg-def.el index 425093832f8..4d30e326148 100644 --- a/lisp/obsolete/pgg-def.el +++ b/lisp/obsolete/pgg-def.el @@ -1,4 +1,4 @@ -;;; pgg-def.el --- functions/macros for defining PGG functions +;;; pgg-def.el --- functions/macros for defining PGG functions -*- lexical-binding: t; -*- ;; Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. @@ -32,47 +32,39 @@ (defcustom pgg-default-scheme 'gpg "Default PGP scheme." - :group 'pgg :type '(choice (const :tag "GnuPG" gpg) (const :tag "PGP 5" pgp5) (const :tag "PGP" pgp))) (defcustom pgg-default-user-id (user-login-name) "User ID of your default identity." - :group 'pgg :type 'string) (defcustom pgg-default-keyserver-address "subkeys.pgp.net" "Host name of keyserver." - :group 'pgg :type 'string) (defcustom pgg-query-keyserver nil "Whether PGG queries keyservers for missing keys when verifying messages." :version "22.1" - :group 'pgg :type 'boolean) (defcustom pgg-encrypt-for-me t "If t, encrypt all outgoing messages with user's public key." - :group 'pgg :type 'boolean) (defcustom pgg-cache-passphrase t "If t, cache passphrase." - :group 'pgg :type 'boolean) (defcustom pgg-passphrase-cache-expiry 16 "How many seconds the passphrase is cached. Whether the passphrase is cached at all is controlled by `pgg-cache-passphrase'." - :group 'pgg :type 'integer) (defcustom pgg-passphrase-coding-system nil "Coding system to encode passphrase." - :group 'pgg :type 'coding-system) (defvar pgg-messages-coding-system nil |