X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fpackage-admin.el;h=d13a853b12297f4c4329e8296e0cbd9aeb62866e;hb=6986e39e1e0b14b565f08eae2241c710f7140598;hp=d5603ec332580dcd7a534dd22a9265617d81211e;hpb=28a3fa29bc0bd9a124b6e3379e82d62e815c22a2;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/package-admin.el b/lisp/package-admin.el
index d5603ec..d13a853 100644
--- a/lisp/package-admin.el
+++ b/lisp/package-admin.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1997 by Free Software Foundation, Inc.
 
-;; Author: SL Baur <steve@altair.xemacs.org>
+;; Author: SL Baur <steve@xemacs.org>
 ;; Keywords: internal
 
 ;; This file is part of XEmacs.
@@ -42,9 +42,9 @@
 					   'package-admin-install-function-mswindows
 					 'package-admin-default-install-function)
   "The function to call to install a package.
-Three args are passed: FILENAME PKG-DIR BUF
+Three args are passed: FILENAME PKG-DIR BUFFER
 Install package FILENAME into directory PKG-DIR, with any messages output
-to buffer BUF.")
+to buffer BUFFER.")
 
 (defvar package-admin-error-messages '(
 				       "No space left on device"
@@ -123,31 +123,31 @@ The optional `pkg-dir' can be used to override the default package hierarchy
 		  ;; rest of command line follows
 		  package-admin-xemacs file destination)))
 
-(defun package-admin-install-function-mswindows (file pkg-dir buf)
-  "Install function for mswindows"
+(defun package-admin-install-function-mswindows (file pkg-dir buffer)
+  "Install function for mswindows."
   (let ((default-directory (file-name-as-directory pkg-dir)))
     (unless (file-directory-p default-directory)
       (make-directory default-directory t))
-    (call-process "minitar" nil buf t file)))
+    (call-process "minitar" nil buffer t file)))
 
-(defun package-admin-default-install-function (file pkg-dir buf)
+(defun package-admin-default-install-function (filename pkg-dir buffer)
   "Default function to install a package.
 Install package FILENAME into directory PKG-DIR, with any messages output
-to buffer BUF."
+to BUFFER."
   (let* ((pkg-dir (file-name-as-directory pkg-dir))
 	 (default-directory pkg-dir)
-	 (filename (expand-file-name file)))
+	 (filename (expand-file-name filename)))
     (unless (file-directory-p pkg-dir)
       (make-directory pkg-dir t))
     ;; Don't assume GNU tar.
-    (if (shell-command (concat "gunzip -c " filename " | tar xvf -") buf)
+    (if (shell-command (concat "gunzip -c " filename " | tar xvf -") buffer)
 	0
       1)
     ))
 
 ;  (call-process "add-big-package.sh"
 ;		nil
-;		buf
+;		buffer
 ;		t
 ;		;; rest of command line follows
 ;		package-admin-xemacs file pkg-dir))
@@ -165,13 +165,13 @@ or return a location appropriate for the package otherwise."
 	         (featurep package-feature)
 		 (setq autoload-dir (feature-file package-feature))
 		 (setq autoload-dir (file-name-directory autoload-dir))
-		 (member autoload-dir late-package-load-path))
-	;; Find the corresonding entry in late-package
+		 (member autoload-dir (append early-package-load-path late-package-load-path)))
+	;; Find the corresponding entry in late-package
 	(setq pkg-dir
 	      (car-safe (member-if (lambda (h)
 			   (string-match (concat "^" (regexp-quote h))
 					 autoload-dir))
-			 late-packages))))
+			 (append (cdr early-packages) late-packages)))))
       (if pkg-dir
 	  pkg-dir
 	;; Ok we need to guess
@@ -180,7 +180,7 @@ or return a location appropriate for the package otherwise."
 	  (if (eq package 'xemacs-base)
 	      (car (last late-packages))
 	    (package-admin-get-install-dir 'xemacs-base nil nil)))))))
-	  
+
 
 
 (defun package-admin-get-manifest-file (pkg-topdir package)
@@ -294,7 +294,7 @@ is the top-level directory under which the package was installed."
 		      ;; Create pkginfo, if necessary
 		      (if (not (file-directory-p pathname))
 			  (make-directory pathname))
-		      (setq pathname (expand-file-name 
+		      (setq pathname (expand-file-name
 				      (concat "MANIFEST." package-name)
 				      pathname))
 		      (save-excursion
@@ -435,13 +435,14 @@ PACKAGE is a symbol, not a string."
 		  ;; Note, user might have removed the file!
 		(condition-case ()
 		    (delete-file file)
-		  (error nil)))		;; We may want to turn the error into a Warning?   
+		  (error nil)))		;; We may want to turn the error into a Warning?
 	      (forward-line 1))
-	      
+
 	    ;; Delete empty directories.
 	    (if dirs
 		(let ( (orig-default-directory default-directory)
-		       directory files file )
+		       ;; directory files file
+		       )
 		  ;; Make sure we preserve the existing `default-directory'.
 		  ;; JV, why does this change the default directory? Does it indeed?
 		  (unwind-protect
@@ -472,7 +473,7 @@ PACKAGE is a symbol, not a string."
 			   (lambda (dir)
 			     (condition-case ()
 				 (delete-directory dir)))
-			   dirs))			
+			   dirs))
 		    (setq default-directory orig-default-directory)
 		    )))
 	    )
@@ -498,7 +499,7 @@ PACKAGE is a symbol, not a string."
 	      (package-admin-rmtree package-lispdir)
 	      (message "Removing old lisp directory \"%s\" ... done"
 		       package-lispdir)
-	      ))	
+	      ))
     ;; Delete the package from the database of installed packages.
     (package-delete-name package)))