# HG changeset patch
# User youngs
# Date 1026886419 0
# Node ID e40f8d860d5f4d63c98978ef2fcca8d57d2789cb
# Parent  4f61e79f8a14f211494343f84b3bcbaa384c7c23
[xemacs-hg @ 2002-07-17 06:13:39 by youngs]

2002-07-17  Steve Youngs  <youngs@xemacs.org>

	* package-get.el (package-get-update-base-from-buffer): Re-write
	so it doesn't rely on the APEL package.

diff -r 4f61e79f8a14 -r e40f8d860d5f lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 16 08:27:11 2002 +0000
+++ b/lisp/ChangeLog	Wed Jul 17 06:13:39 2002 +0000
@@ -1,3 +1,8 @@
+2002-07-17  Steve Youngs  <youngs@xemacs.org>
+
+	* package-get.el (package-get-update-base-from-buffer): Re-write
+	so it doesn't rely on the APEL package.
+
 2002-07-16  Didier Verna  <didier@xemacs.org>
 
 	* subr.el (replace-in-string): fix case fold bug introduced by
diff -r 4f61e79f8a14 -r e40f8d860d5f lisp/package-get.el
--- a/lisp/package-get.el	Tue Jul 16 08:27:11 2002 +0000
+++ b/lisp/package-get.el	Wed Jul 17 06:13:39 2002 +0000
@@ -441,23 +441,29 @@
       (setq package-get-continue-update-base t)
       (if package-get-require-signed-base-updates 
 	  (if package-entries-are-signed
-	      (progn
-		(setq package-get-continue-update-base nil)
-		(autoload 'mc-setversion "mc-setversion")
-		(with-fboundp 'mc-setversion
-		  (if-boundp 'exec-suffix-list
-		      (or
-		       (cond ((locate-file "gpg" exec-path exec-suffix-list)
-			      (mc-setversion "gpg"))
-			     ((locate-file "pgpe" exec-path exec-suffix-list)
-			      (mc-setversion "5.0"))
-			     ((locate-file "pgp" exec-path exec-suffix-list)
-			      (mc-setversion "2.6")))
-		       (error "Can't find a suitable pgp executable"))
-		    (error 'unimplemented "`apel' package unavailable")))
-		(autoload 'mc-verify "mc-toplev")
-		(declare-fboundp (mc-verify))
-		(setq package-get-continue-update-base t))
+	      (if (featurep 'mailcrypt-autoloads)
+		  (progn
+		    (setq package-get-continue-update-base nil)
+		    (autoload 'mc-setversion "mc-setversion")
+		    (cond ((locate-file "gpg" exec-path
+					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
+					'executable)
+			   (mc-setversion "gpg"))
+			  ((locate-file "pgpe" exec-path
+					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
+					'executable)
+			   (mc-setversion "5.0"))
+			  ((locate-file "pgp" exec-path
+					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
+					'executable)
+			   (mc-setversion "2.6"))
+			  (t
+			   (error 'search-failed 
+				  "Can't find a suitable PGP executable")))
+		    (autoload 'mc-verify "mc-toplev")
+		    (declare-fboundp (mc-verify))
+		    (setq package-get-continue-update-base t))
+		(error 'unimplemented "`mailcrypt' package unavailable"))
 	    (if (yes-or-no-p
 		 "Package Index is not PGP signed.  Continue anyway? ")
 		(setq package-get-continue-update-base t)