X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fpackage-admin.el;h=d5603ec332580dcd7a534dd22a9265617d81211e;hb=5854fb5730482af8fb33e449621f5241bd1a7d74;hp=730f5f34a37c172a6233374c9c360f0ddfc25a2a;hpb=35adcaaeafb1fe93eaf00c39b48619e8f188ff3f;p=chise%2Fxemacs-chise.git

diff --git a/lisp/package-admin.el b/lisp/package-admin.el
index 730f5f3..d5603ec 100644
--- a/lisp/package-admin.el
+++ b/lisp/package-admin.el
@@ -38,7 +38,9 @@
 (defvar package-admin-temp-buffer "*Package Output*"
   "Temporary buffer where output of backend commands is saved.")
 
-(defvar package-admin-install-function 'package-admin-default-install-function
+(defvar package-admin-install-function (if (eq system-type 'windows-nt)
+					   '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
 Install package FILENAME into directory PKG-DIR, with any messages output
@@ -126,7 +128,7 @@ The optional `pkg-dir' can be used to override the default package hierarchy
   (let ((default-directory (file-name-as-directory pkg-dir)))
     (unless (file-directory-p default-directory)
       (make-directory default-directory t))
-    (call-process "djtar" nil buf t "-x" file)))
+    (call-process "minitar" nil buf t file)))
 
 (defun package-admin-default-install-function (file pkg-dir buf)
   "Default function to install a package.
@@ -175,7 +177,9 @@ or return a location appropriate for the package otherwise."
 	;; Ok we need to guess
 	(if mule-related
 	    (package-admin-get-install-dir 'mule-base nil nil)
-	  (car (last late-packages)))))))
+	  (if (eq package 'xemacs-base)
+	      (car (last late-packages))
+	    (package-admin-get-install-dir 'xemacs-base nil nil)))))))
 	  
 
 
@@ -324,7 +328,7 @@ is the top-level directory under which the package was installed."
 	start err-list
 	)
     (setq pkg-dir (package-admin-get-install-dir 'unknown pkg-dir))
-    ;; Insure that the current directory doesn't change
+    ;; Ensure that the current directory doesn't change
     (save-excursion
       (set-buffer buf)
       ;; This is not really needed
@@ -437,8 +441,7 @@ PACKAGE is a symbol, not a string."
 	    ;; 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