X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fpgg-def.el;h=45dd5abe348c8c17f9ac9c4f4623f7f8ae6fc4b4;hb=609e9daf5a06f5d39ca20cc6718f72a414866870;hp=7630f95a1c394435a276ff9ef6f35834790ec467;hpb=4561b7af638f16343fbfef6a8227c498be6d6cc5;p=gnus

diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index 7630f95a1..45dd5abe3 100644
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -1,22 +1,22 @@
 ;;; pgg-def.el --- functions/macros for defining PGG functions
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2003 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
 ;; Keywords: PGP, OpenPGP, GnuPG
 
-;; This file is part of SEMI (Secure Emacs MIME Interface).
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
 
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
@@ -25,8 +25,6 @@
 
 ;;; Code:
 
-(require 'custom)
-
 (defgroup pgg ()
   "Glue for the various PGP implementations."
   :group 'mime)
@@ -43,12 +41,17 @@
   :group 'pgg
   :type 'string)
 
-(defcustom pgg-default-keyserver-address "wwwkeys.pgp.net"
+(defcustom pgg-default-keyserver-address "subkeys.pgp.net"
   "Host name of keyserver."
   :group 'pgg
   :type 'string)
 
-(defcustom pgg-encrypt-for-me nil
+(defcustom pgg-query-keyserver nil
+  "Whether PGG queries keyservers for missing keys when verifying messages."
+  :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)
@@ -58,6 +61,13 @@
   :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)
+
 (defvar pgg-messages-coding-system nil
   "Coding system used when reading from a PGP external process.")