2001-12-26 Florian Weimer <fw@deneb.enyo.de>

	* gpg.el (gpg-command-default-alist): Using gpg-2comp is no longer
	the default.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 49cd5d0..2868fdb 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-26  Florian Weimer  <fw@deneb.enyo.de>
+
+       * gpg.el (gpg-command-default-alist): Using gpg-2comp is no longer
+       the default.
+
 2001-12-18  Josh Huber  <huber@alum.wpi.edu>
 
        * ChangeLog: changed buffer-file-coding-system back to

diff --git a/contrib/gpg.el b/contrib/gpg.el
index f071345..9f8e5e5 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -7,7 +7,7 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 
-;; $Id: gpg.el,v 1.15 2001/08/10 17:23:27 zsh Exp $
+;; $Id: gpg.el,v 1.16 2001/08/24 21:09:02 larsi Exp $
 
 ;; This file is NOT (yet?) part of GNU Emacs.
 
@@ -41,8 +41,8 @@
 ;; * Customization for all flavors of PGP is possible.
 ;; * The main operations (verify, decrypt, sign, encrypt, sign &
 ;;   encrypt) are implemented.
-;; * Gero Treuner's gpg-2comp script is supported, and data which is is
-;;   compatible with PGP 2.6.3 is generated.
+;; * Optionally, Gero Treuner's gpg-2comp script is supported, 
+;;   to generate data which is compatible with PGP 2.6.3.
 
 ;; Customizing external programs 
 ;; =============================
@@ -227,12 +227,12 @@ If you are running Emacs 20, this directory must have mode 0700."
 
 (defcustom gpg-command-default-alist 
   '((gpg . "gpg")
-    (gpg-2comp . "gpg-2comp"))
+    (gpg-2comp . "gpg"))
   "Default paths for some GnuPG-related programs.
 Modify this variable if you have to change the paths to the
-executables required by the GnuPG interface.  You can enter \"gpg\"
-for `gpg-2comp' if you don't have this script, but you'll lose PGP
-2.6.x compatibility."
+executables required by the GnuPG interface.  You can enter \"gpg-2comp\"
+for `gpg-2comp' if you have obtained this script, in order to gain
+PGP 2.6.x compatibility."
   :tag "GnuPG programs"
   :type 'gpg-command-alist
   :group 'gpg-options)