Mercurial > hg > xemacs-beta

diff lisp/package-get.el @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents a307f9a2021d
children 79940b592197
line wrap: on
line diff
--- a/lisp/package-get.el	Fri Mar 08 13:33:14 2002 +0000
+++ b/lisp/package-get.el	Wed Mar 13 08:54:06 2002 +0000
@@ -422,36 +422,39 @@
 used interactively, for example from a mail or news buffer."
   (interactive)
   (setq buf (or buf (current-buffer)))
-  (let (content-beg content-end beg end)
+  (let (content-beg content-end ;beg end
+		    )
     (save-excursion
       (set-buffer buf)
       (goto-char (point-min))
       (setq content-beg (point))
       (setq content-end (save-excursion (goto-char (point-max)) (point)))
       (when (re-search-forward package-get-pgp-signed-begin-line nil t)
-        (setq beg (match-beginning 0))
+        ;(setq beg (match-beginning 0))
         (setq content-beg (match-end 0)))
       (when (re-search-forward package-get-pgp-signature-begin-line nil t)
         (setq content-end (match-beginning 0))
 	(setq package-entries-are-signed t))
       (when (re-search-forward package-get-pgp-signature-end-line nil t)
-        (setq end (point)))
+        ;(setq end (point))
+	)
       (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")
-		(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"))
+		(with-fboundp 'mc-setversion
+		  (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")))
 		(autoload 'mc-verify "mc-toplev")
-		(mc-verify)
+		(declare-fboundp (mc-verify))
 		(setq package-get-continue-update-base t))
 	    (if (yes-or-no-p
 		 "Package Index is not PGP signed.  Continue anyway? ")