diff lisp/package-get.el @ 776:79940b592197

[xemacs-hg @ 2002-03-15 07:43:14 by ben] .cvsignore: ignore .tmp files that are getting auto-created by VC. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). alloc.c, emacs.c, lisp.h: add new -no-packages. make sure list of args for sorting is actually correct. clean up arg parsing code. xemacs.mak: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs).
author ben
date Fri, 15 Mar 2002 07:43:43 +0000
parents 943eaba38521
children e38acbeb1cae
line wrap: on
line diff
--- a/lisp/package-get.el	Thu Mar 14 11:50:17 2002 +0000
+++ b/lisp/package-get.el	Fri Mar 15 07:43:43 2002 +0000
@@ -445,14 +445,16 @@
 		(setq package-get-continue-update-base nil)
 		(autoload 'mc-setversion "mc-setversion")
 		(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")))
+		  (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))
@@ -966,8 +968,8 @@
   (if (not (file-exists-p package-get-dir))
       (make-directory package-get-dir))
   (expand-file-name
-   (file-name-nondirectory (or (and (fboundp 'efs-ftp-path)
-				    (nth 2 (efs-ftp-path filename)))
+   (file-name-nondirectory (or (and-fboundp 'efs-ftp-path
+				 (nth 2 (efs-ftp-path filename)))
 			       filename))
    (file-name-as-directory package-get-dir)))